aboutsummaryrefslogtreecommitdiff
path: root/src/menubar.vala
diff options
context:
space:
mode:
Diffstat (limited to 'src/menubar.vala')
-rw-r--r--src/menubar.vala88
1 files changed, 46 insertions, 42 deletions
diff --git a/src/menubar.vala b/src/menubar.vala
index 799cb18..128be17 100644
--- a/src/menubar.vala
+++ b/src/menubar.vala
@@ -237,35 +237,36 @@ public class MenuBar : Gtk.MenuBar
return a11y_item;
}
- private Indicator.Object? load_indicator_file (string indicator_name)
- {
- string dir = Config.INDICATOR_FILE_DIR;
- string path;
- Indicator.Object io;
-
- /* To stay backwards compatible, use com.canonical.indicator as the default prefix */
- if (indicator_name.index_of_char ('.') < 0)
- path = @"$dir/com.canonical.indicator.$indicator_name";
- else
- path = @"$dir/$indicator_name";
-
- try
- {
- io = new Indicator.Ng.for_profile (path, "desktop_greeter");
- }
- catch (FileError error)
- {
- /* the calling code handles file-not-found; don't warn here */
- return null;
- }
- catch (Error error)
- {
- warning ("unable to load %s: %s", indicator_name, error.message);
- return null;
- }
-
- return io;
- }
+ //private Indicator.Object? load_indicator_file (string indicator_name)
+ //{
+
+ // string dir = Config.INDICATOR_FILE_DIR;
+ // string path;
+ // Indicator.Object io;
+
+ // /* To stay backwards compatible, use com.canonical.indicator as the default prefix */
+ // if (indicator_name.index_of_char ('.') < 0)
+ // path = @"$dir/com.canonical.indicator.$indicator_name";
+ // else
+ // path = @"$dir/$indicator_name";
+
+ // try
+ // {
+ // io = new Indicator.Ng.for_profile (path, "desktop_greeter");
+ // }
+ // catch (FileError error)
+ // {
+ // /* the calling code handles file-not-found; don't warn here */
+ // return null;
+ // }
+ // catch (Error error)
+ // {
+ // warning ("unable to load %s: %s", indicator_name, error.message);
+ // return null;
+ // }
+
+ // return io;
+ //}
private Indicator.Object? load_indicator_library (string indicator_name)
{
@@ -293,10 +294,13 @@ public class MenuBar : Gtk.MenuBar
}
else
{
- var io = load_indicator_file (indicator_name);
+ // var io = load_indicator_file (indicator_name);
+
+ // if (io == null)
+ // io = load_indicator_library (indicator_name);
- if (io == null)
- io = load_indicator_library (indicator_name);
+ // Use the below line of code instead...
+ var io = load_indicator_library (indicator_name);
if (io != null)
{
@@ -318,7 +322,7 @@ public class MenuBar : Gtk.MenuBar
greeter_set_env ("GIO_USE_VFS", "local");
greeter_set_env ("GVFS_DISABLE_FUSE", "1");
- /* Hint to have unity-settings-daemon run in greeter mode */
+ /* Hint to have mate-settings-daemon run in greeter mode */
greeter_set_env ("RUNNING_UNDER_GDM", "1");
/* Let indicators know about our unique dbus name */
@@ -352,17 +356,17 @@ public class MenuBar : Gtk.MenuBar
foreach (var indicator in indicator_list)
load_indicator(indicator);
- indicator_objects.sort((a, b) => {
- int pos_a = a.get_position ();
- int pos_b = b.get_position ();
+ // indicator_objects.sort((a, b) => {
+ // int pos_a = a.get_position ();
+ // int pos_b = b.get_position ();
- if (pos_a < 0)
- pos_a = 1000;
- if (pos_b < 0)
- pos_b = 1000;
+ // if (pos_a < 0)
+ // pos_a = 1000;
+ // if (pos_b < 0)
+ // pos_b = 1000;
- return pos_a - pos_b;
- });
+ // return pos_a - pos_b;
+ // });
debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
}