aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-11-07 06:08:26 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-11-07 06:08:26 +0000
commit37f53f359fdbb3fea014f3583d58d12be79a0e77 (patch)
treeca3ace1671812f6252dc4f72f7cbd46a8dd589fa /src
parent9f47961302b87d139326f4a08f045ee5ab03248b (diff)
downloadarctica-greeter-37f53f359fdbb3fea014f3583d58d12be79a0e77.tar.gz
arctica-greeter-37f53f359fdbb3fea014f3583d58d12be79a0e77.tar.bz2
arctica-greeter-37f53f359fdbb3fea014f3583d58d12be79a0e77.zip
Build against Ayatana Indicators instead of Ubuntu Inidicators.
Diffstat (limited to 'src')
-rw-r--r--src/arctica-greeter.vala2
-rw-r--r--src/indicator.vapi68
-rw-r--r--src/menubar.vala87
3 files changed, 77 insertions, 80 deletions
diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala
index 37c28db..db73f86 100644
--- a/src/arctica-greeter.vala
+++ b/src/arctica-greeter.vala
@@ -488,7 +488,7 @@ public class ArcticaGreeter
}
Gtk.init (ref args);
- // Ido.init ();
+ Ido.init ();
log_timer = new Timer ();
Log.set_default_handler (log_cb);
diff --git a/src/indicator.vapi b/src/indicator.vapi
index 358d0a7..5c0154e 100644
--- a/src/indicator.vapi
+++ b/src/indicator.vapi
@@ -1,6 +1,6 @@
[CCode (cprefix = "Indicator", lower_case_cprefix = "indicator_")]
namespace Indicator {
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public class DesktopShortcuts : GLib.Object {
[CCode (has_construct_function = false)]
public DesktopShortcuts (string file, string identity);
@@ -11,7 +11,7 @@ namespace Indicator {
[NoAccessorMethod]
public string identity { owned get; construct; }
}
- [CCode (cheader_filename = "libindicator/indicator-object.h")]
+ [CCode (cheader_filename = "libayatana-indicator/indicator-object.h")]
public class Object : GLib.Object {
[CCode (has_construct_function = false)]
protected Object ();
@@ -36,7 +36,7 @@ namespace Indicator {
[NoWrapper]
public virtual unowned string get_name_hint ();
public virtual bool get_show_now (Indicator.ObjectEntry entry);
-// public virtual int get_position ();
+ public virtual int get_position ();
[NoWrapper]
public virtual void reserved1 ();
[NoWrapper]
@@ -57,13 +57,13 @@ namespace Indicator {
public virtual signal void show_now_changed (Indicator.ObjectEntry entry, bool show_now_state);
}
-// [CCode (cheader_filename = "libindicator/indicator-ng.h")]
-// public class Ng : Object {
-// [CCode (has_construct_function = false)]
-// public Ng.for_profile (string filename, string profile) throws GLib.Error;
-// }
+ [CCode (cheader_filename = "libayatana-indicator/indicator-ng.h")]
+ public class Ng : Object {
+ [CCode (has_construct_function = false)]
+ public Ng.for_profile (string filename, string profile) throws GLib.Error;
+ }
[Compact]
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public class ObjectEntry {
public weak string accessible_desc;
public weak Gtk.Image image;
@@ -77,7 +77,7 @@ namespace Indicator {
public static void activate (Indicator.Object io, Indicator.ObjectEntry entry, uint timestamp);
public static void close (Indicator.Object io, Indicator.ObjectEntry entry, uint timestamp);
}
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public class Service : GLib.Object {
[CCode (has_construct_function = false)]
public Service (string name);
@@ -95,7 +95,7 @@ namespace Indicator {
public string name { owned get; set; }
public virtual signal void shutdown ();
}
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public class ServiceManager : GLib.Object {
[CCode (has_construct_function = false)]
public ServiceManager (string dbus_name);
@@ -115,52 +115,52 @@ namespace Indicator {
public string name { owned get; set; }
public virtual signal void connection_change (bool connected);
}
- [CCode (cprefix = "INDICATOR_OBJECT_SCROLL_", has_type_id = false, cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cprefix = "INDICATOR_OBJECT_SCROLL_", has_type_id = false, cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public enum ScrollDirection {
UP,
DOWN,
LEFT,
RIGHT
}
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h", has_target = false)]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h", has_target = false)]
public delegate GLib.Type get_type_t ();
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h", has_target = false)]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h", has_target = false)]
public delegate unowned string get_version_t ();
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const string GET_TYPE_S;
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const string GET_VERSION_S;
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const string OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE;
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const string OBJECT_SIGNAL_ENTRY_ADDED;
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const string OBJECT_SIGNAL_ENTRY_MOVED;
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const string OBJECT_SIGNAL_ENTRY_REMOVED;
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const string OBJECT_SIGNAL_ENTRY_SCROLLED;
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const string OBJECT_SIGNAL_MENU_SHOW;
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const string OBJECT_SIGNAL_SHOW_NOW_CHANGED;
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const string SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE;
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const string SERVICE_SIGNAL_SHUTDOWN;
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const int SET_VERSION;
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public const string VERSION;
- [CCode (cname = "get_version", cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cname = "get_version", cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public static unowned string get_version ();
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public static unowned Gtk.Image image_helper (string name);
- [CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
+ [CCode (cheader_filename = "gtk/gtk.h,libayatana-indicator/indicator.h,libayatana-indicator/indicator-desktop-shortcuts.h,libayatana-indicator/indicator-image-helper.h,libayatana-indicator/indicator-object.h,libayatana-indicator/indicator-service.h,libayatana-indicator/indicator-service-manager.h")]
public static void image_helper_update (Gtk.Image image, string name);
}
-//[CCode (cheader_filename="libido/libido.h", lower_case_cprefix = "ido_")]
-//namespace Ido {
-// public void init ();
-//}
+[CCode (cheader_filename="libayatana-ido/libayatana-ido.h", lower_case_cprefix = "ido_")]
+namespace Ido {
+ public void init ();
+}
diff --git a/src/menubar.vala b/src/menubar.vala
index 17a5ad7..2f52e42 100644
--- a/src/menubar.vala
+++ b/src/menubar.vala
@@ -237,36 +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 org.ayatana.indicator as the default prefix */
- // if (indicator_name.index_of_char ('.') < 0)
- // path = @"$dir/org.ayatana.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 org.ayatana.indicator as the default prefix */
+ if (indicator_name.index_of_char ('.') < 0)
+ path = @"$dir/org.ayatana.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)
{
@@ -294,13 +294,10 @@ public class MenuBar : Gtk.MenuBar
}
else
{
- // var io = load_indicator_file (indicator_name);
-
- // if (io == null)
- // io = load_indicator_library (indicator_name);
+ var io = load_indicator_file (indicator_name);
- // Use the below line of code instead...
- var io = load_indicator_library (indicator_name);
+ if (io == null)
+ io = load_indicator_library (indicator_name);
if (io != null)
{
@@ -356,17 +353,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"));
}