Merge lp:~l-admin-3/pantheon-greeter/indicator-api-integration into lp:~elementary-pantheon/pantheon-greeter/trunk

[Cody Garver]

Use new indicator API to show LibWingpanel indicators

[Felipe Escoto (philip.scott)]

Looks and works pretty good! Just one nitpic: We've changed to using braces even if there's only one line of code on if blocks: https://elementary.io/docs/code/reference#indentation

[Danielle Foré (danrabbit)]

I'm going to merge this as we're already using it in Loki

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-07-20 11:24:02 +0000
+++ CMakeLists.txt	2015-08-03 22:34:06 +0000
@@ -28,7 +28,7 @@
 add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 
 find_package (PkgConfig)
-pkg_check_modules (DEPS REQUIRED granite liblightdm-gobject-1>=1.2.1 gdk-x11-3.0 clutter-gtk-1.0 indicator3-0.4 gdk-pixbuf-2.0 gl)
+pkg_check_modules (DEPS REQUIRED granite liblightdm-gobject-1>=1.2.1 gdk-x11-3.0 clutter-gtk-1.0 gdk-pixbuf-2.0 gl wingpanel-2.0)
 add_definitions (${DEPS_CFLAGS})
 link_libraries (${DEPS_LIBRARIES})
 link_directories (${DEPS_LIBRARY_DIRS})
@@ -51,8 +51,8 @@
     gdk-x11-3.0
     x11
     clutter-gtk-1.0
-    indicator-0.4
     gl
+    wingpanel-2.0
 OPTIONS
     --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
 )

=== removed file 'src/Indicators/AccessibilityMenu.vala'
--- src/Indicators/AccessibilityMenu.vala	2015-01-17 06:55:55 +0000
+++ src/Indicators/AccessibilityMenu.vala	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-
-
-public class AccessibilityMenu : Gtk.MenuItem {
-
-    int onboard_stdout_fd;
-    Gtk.Window keyboard_window;
-    unowned KeyFile settings;
-    int keyboard_pid;
-
-    public AccessibilityMenu (KeyFile _settings) {
-        this.settings = _settings;
-        try {
-            add (new Gtk.Image.from_pixbuf (Gtk.IconTheme.get_default ().lookup_by_gicon (
-                                                          new GLib.ThemedIcon.with_default_fallbacks ("preferences-desktop-accessibility-symbolic"),
-                                                          16, 0).load_symbolic ({1,1,1,1})));
-        } catch (Error e) {
-            warning (e.message);
-        }
-
-        submenu = new Gtk.Menu ();
-
-        var keyboard = new Gtk.CheckMenuItem.with_label (_("Onscreen Keyboard"));
-        try {
-            keyboard.active = settings.get_boolean ("greeter", "onscreen-keyboard");
-        } catch (Error e) {
-            warning (e.message);
-        }
-
-        keyboard.toggled.connect ((e) => {
-            toggle_keyboard (e.active);
-        });
-        submenu.append (keyboard);
-
-        var high_contrast = new Gtk.CheckMenuItem.with_label (_("HighContrast"));
-        high_contrast.toggled.connect (() => {
-            Gtk.Settings.get_default ().gtk_theme_name = high_contrast.active ? "HighContrastInverse" : "elementary";
-            settings.set_boolean ("greeter", "high-contrast", high_contrast.active);
-        });
-
-        try {
-            high_contrast.active = settings.get_boolean ("greeter", "high-contrast");
-        } catch (Error e) {
-            warning (e.message);
-        }
-
-        submenu.append (high_contrast);
-
-        try {
-            if (settings.get_boolean ("greeter", "onscreen-keyboard")) {
-                toggle_keyboard (true);
-            }
-        } catch (Error e) {
-            warning (e.message);
-        }
-    }
-
-    ~AccessibilityMenu () {
-        if (keyboard_pid != 0) {
-            Posix.kill (keyboard_pid, Posix.SIGKILL);
-
-            int status;
-            Posix.waitpid (keyboard_pid, out status, 0);
-            keyboard_pid = 0;
-        }
-    }
-
-    public void toggle_keyboard (bool active) {
-        if (keyboard_window != null) {
-            keyboard_window.visible = active;
-            settings.set_boolean ("greeter", "onscreen-keyboard", active);
-            return;
-        }
-
-        int id = 0;
-
-        try {
-            string [] argv;
-            Shell.parse_argv ("onboard --xid", out argv);
-            Process.spawn_async_with_pipes (null, argv, null, SpawnFlags.SEARCH_PATH, null, out keyboard_pid, null, out onboard_stdout_fd, null);
-
-            var f = FileStream.fdopen (onboard_stdout_fd, "r");
-            var stdout_text = new char[1024];
-            f.gets (stdout_text);
-            id = int.parse ((string)stdout_text);
-        } catch (Error e) {
-            warning (e.message);
-        }
-
-        var keyboard_socket = new Gtk.Socket ();
-        keyboard_window = new Gtk.Window ();
-        keyboard_window.accept_focus = false;
-        keyboard_window.focus_on_map = false;
-        keyboard_window.add (keyboard_socket);
-        keyboard_socket.add_id (id);
-
-        var screen = Gdk.Screen.get_default ();
-        var monitor = screen.get_primary_monitor ();
-        Gdk.Rectangle geom;
-        screen.get_monitor_geometry (monitor, out geom);
-        keyboard_window.move (geom.x, geom.y + geom.height - 200);
-        keyboard_window.resize (geom.width, 200);
-        keyboard_window.set_keep_above (true);
-
-        keyboard_window.show_all ();
-        settings.set_boolean ("greeter", "onscreen-keyboard", true);
-    }
-
-}

=== added file 'src/Indicators/EntryList.vala'
--- src/Indicators/EntryList.vala	1970-01-01 00:00:00 +0000
+++ src/Indicators/EntryList.vala	2015-08-03 22:34:06 +0000
@@ -0,0 +1,70 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/***
+    BEGIN LICENSE
+
+    Copyright (C) 2011-2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE.  See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program.  If not, see <http://www.gnu.org/licenses/>
+
+    END LICENSE
+***/
+
+public class Indicators.EntryList : Gee.ArrayList<IndicatorEntry> {
+    // The order in which the indicators are shown from left to right.
+    private const string[] INDICATOR_ORDER = {
+        Wingpanel.Indicator.KEYBOARD,
+        Wingpanel.Indicator.SOUND,
+        Wingpanel.Indicator.NETWORK,
+        Wingpanel.Indicator.BLUETOOTH,
+        Wingpanel.Indicator.PRINTER,
+        Wingpanel.Indicator.SYNC,
+        Wingpanel.Indicator.POWER,
+        Wingpanel.Indicator.MESSAGES,
+        Wingpanel.Indicator.SESSION
+    };
+
+    public signal void list_changed ();
+
+    public async void resort () {
+        message ("Resorting indicators...");
+
+        this.sort ((a, b) => {
+            if (a == null)
+                return (b == null) ? 0 : -1;
+
+            if (b == null)
+                return 1;
+
+            string a_name = a.get_code_name ().down ();
+            string b_name = b.get_code_name ().down ();
+
+            int order = get_item_index (a_name) - get_item_index (b_name);
+
+            if (order == 0)
+                order = strcmp (a_name, b_name);
+
+            return order.clamp (-1, 1);
+        });
+
+        list_changed ();
+    }
+
+    private int get_item_index (string item) {
+        for (int i = 0; i < INDICATOR_ORDER.length; i++) {
+            if (INDICATOR_ORDER[i].down () == item)
+                return i;
+        }
+
+        return 0;
+    }
+}

=== added file 'src/Indicators/IndicatorBar.vala'
--- src/Indicators/IndicatorBar.vala	1970-01-01 00:00:00 +0000
+++ src/Indicators/IndicatorBar.vala	2015-08-03 22:34:06 +0000
@@ -0,0 +1,124 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/***
+    BEGIN LICENSE
+
+    Copyright (C) 2011-2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE.  See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program.  If not, see <http://www.gnu.org/licenses/>
+
+    END LICENSE
+***/
+
+public class Indicators.IndicatorBar : GtkClutter.Actor {
+    private EntryList entry_list;
+
+    private PopoverManager popover_manager;
+
+    private Gtk.MenuBar menu_bar;
+
+    public IndicatorBar () {
+        Wingpanel.IndicatorManager.get_default ().initialize (Wingpanel.IndicatorManager.ServerType.GREETER);
+
+        entry_list = new EntryList ();
+        popover_manager = new PopoverManager ();
+
+        build_ui ();
+
+        if (Wingpanel.IndicatorManager.get_default ().has_indicators ()) {
+            load_indicators.begin (() => {
+                entry_list.resort.begin (() => {
+                    update_bar ();
+
+                    connect_signals ();
+                });
+            });
+        }
+    }
+
+    private void build_ui () {
+        var container_widget = (Gtk.Container)this.get_widget ();
+
+        menu_bar = new Gtk.MenuBar ();
+        menu_bar.can_focus = true;
+        menu_bar.border_width = 0;
+        menu_bar.override_background_color (Gtk.StateFlags.NORMAL, {0, 0, 0, 0});
+        menu_bar.get_style_context ().add_class (StyleClass.PANEL);
+        menu_bar.halign = Gtk.Align.END;
+
+        container_widget.add (menu_bar);
+    }
+
+    private async void load_indicators () {
+        message ("Loading indicators...");
+
+        var indicators = Wingpanel.IndicatorManager.get_default ().get_indicators ();
+
+        foreach (Wingpanel.Indicator indicator in indicators) {
+            register_indicator (indicator);
+        }
+    }
+
+    private bool register_indicator (Wingpanel.Indicator indicator) {
+        message ("Loading indicator %s...", indicator.code_name);
+
+        var indicator_entry = new IndicatorEntry (indicator);
+        indicator_entry.visibility_changed.connect (update_bar);
+
+        if (!entry_list.add (indicator_entry)) {
+            warning ("Registering entry for indicator %s failed.", indicator.code_name);
+
+            return false;
+        }
+
+        var indicator_popover = indicator_entry.get_popover ();
+
+        if (!popover_manager.add (indicator_popover)) {
+            warning ("Registering popover for indicator %s failed.", indicator.code_name);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    private void update_bar () {
+        clear_bar ();
+
+        foreach (IndicatorEntry entry in entry_list) {
+            if (entry.get_is_visible ())
+                menu_bar.append (entry);
+        }
+
+        menu_bar.show_all ();
+    }
+
+    private void connect_signals () {
+        entry_list.list_changed.connect (update_bar);
+
+        Wingpanel.IndicatorManager.get_default ().indicator_added.connect ((indicator) => {
+            if (!register_indicator (indicator))
+                return;
+
+            message ("Requesting resort because indicator %s has been added.", indicator.code_name);
+
+            entry_list.resort.begin ();
+        });
+    }
+
+    private void clear_bar () {
+        var children = menu_bar.get_children ();
+
+        foreach (var child in children)
+            menu_bar.remove (child);
+    }
+}

=== added file 'src/Indicators/IndicatorEntry.vala'
--- src/Indicators/IndicatorEntry.vala	1970-01-01 00:00:00 +0000
+++ src/Indicators/IndicatorEntry.vala	2015-08-03 22:34:06 +0000
@@ -0,0 +1,131 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/***
+    BEGIN LICENSE
+
+    Copyright (C) 2011-2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE.  See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program.  If not, see <http://www.gnu.org/licenses/>
+
+    END LICENSE
+***/
+
+public class Indicators.IndicatorEntry : Gtk.MenuItem {
+    private Gtk.Widget display_widget;
+    private Gtk.Widget? indicator_widget = null;
+
+    private Gtk.Revealer revealer;
+
+    private IndicatorPopover popover;
+    private Wingpanel.Indicator base_indicator;
+
+    public signal void visibility_changed ();
+
+    public IndicatorEntry (Wingpanel.Indicator base_indicator) {
+        this.base_indicator = base_indicator;
+        this.add_events (Gdk.EventMask.SCROLL_MASK);
+        this.get_style_context ().add_class (StyleClass.COMPOSITED_INDICATOR);
+        this.can_focus = false;
+
+        display_widget = base_indicator.get_display_widget ();
+        display_widget.margin_start = 4;
+        display_widget.margin_end = 4;
+
+        if (display_widget == null)
+            return;
+
+        revealer = new Gtk.Revealer ();
+        revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_RIGHT;
+
+        revealer.add (display_widget);
+
+        indicator_widget = base_indicator.get_widget ();
+
+        if (indicator_widget != null) {
+            popover = new IndicatorPopover (indicator_widget);
+            popover.relative_to = this;
+        }
+
+        this.add (revealer);
+
+        set_reveal (base_indicator.visible);
+
+        connect_signals ();
+    }
+
+    public string get_code_name () {
+        return base_indicator.code_name;
+    }
+
+    public bool get_is_visible () {
+        return base_indicator.visible;
+    }
+
+    public IndicatorPopover get_popover () {
+        return popover;
+    }
+
+    private void connect_signals () {
+        base_indicator.notify["visible"].connect (() => {
+            request_resort ();
+
+            set_reveal (base_indicator.visible);
+        });
+
+        base_indicator.close.connect (() => {
+            if (indicator_widget != null)
+                popover.hide ();
+        });
+
+        this.scroll_event.connect ((e) => {
+            display_widget.scroll_event (e);
+
+            return Gdk.EVENT_STOP;
+        });
+
+        this.button_press_event.connect ((e) => {
+            if (indicator_widget != null) {
+                if ((e.button == Gdk.BUTTON_PRIMARY || e.button == Gdk.BUTTON_SECONDARY) && e.type == Gdk.EventType.BUTTON_PRESS) {
+                    if (popover.get_visible ())
+                        popover.hide ();
+                    else
+                        popover.show_all ();
+
+                    return Gdk.EVENT_STOP;
+                }
+            }
+
+            display_widget.button_press_event (e);
+
+            return Gdk.EVENT_PROPAGATE;
+        });
+    }
+
+    private void set_reveal (bool reveal) {
+        if (!reveal && popover.get_visible ())
+            popover.hide ();
+
+        revealer.set_reveal_child (reveal);
+    }
+
+    private void request_resort () {
+        if (base_indicator.visible) {
+            visibility_changed ();
+        } else {
+            Timeout.add (revealer.transition_duration, () => {
+                visibility_changed ();
+
+                return false;
+            });
+        }
+    }
+}

=== added file 'src/Indicators/IndicatorPopover.vala'
--- src/Indicators/IndicatorPopover.vala	1970-01-01 00:00:00 +0000
+++ src/Indicators/IndicatorPopover.vala	2015-08-03 22:34:06 +0000
@@ -0,0 +1,34 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/***
+    BEGIN LICENSE
+
+    Copyright (C) 2011-2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE.  See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program.  If not, see <http://www.gnu.org/licenses/>
+
+    END LICENSE
+***/
+
+public class Indicators.IndicatorPopover : Gtk.Popover {
+    private Gtk.Widget content;
+
+    public IndicatorPopover (Gtk.Widget indicator_widget) {
+        this.set_size_request (220, -1);
+
+        content = indicator_widget;
+        content.margin_top = 3;
+        content.margin_bottom = 3;
+
+        this.add (content);
+    }
+}

=== removed file 'src/Indicators/Indicators.vala'
--- src/Indicators/Indicators.vala	2015-01-17 06:55:55 +0000
+++ src/Indicators/Indicators.vala	1970-01-01 00:00:00 +0000
@@ -1,233 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-    BEGIN LICENSE
-
-    Copyright (C) 2011-2014 elementary Developers
-
-    This program is free software: you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License version 3, as published
-    by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranties of
-    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-    PURPOSE.  See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program.  If not, see <http://www.gnu.org/licenses/>
-
-    END LICENSE
-***/
-
-/*big parts stolen from unity-greeter ;) */
-
-public class IndicatorMenuItem : Gtk.MenuItem {
-
-    public unowned Indicator.ObjectEntry entry;
-    private Gtk.Box hbox;
-
-    public IndicatorMenuItem (Indicator.ObjectEntry _entry) {
-        entry = _entry;
-        hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-        add (this.hbox);
-        hbox.show ();
-
-        if (entry.image != null) {
-            var img = entry.image;
-
-            img.show.connect (visibility_changed_cb);
-            img.hide.connect (visibility_changed_cb);
-            hbox.pack_start (img, false, false, 0);
-            img.show ();
-        }
-
-        if (entry.accessible_desc != null)
-            get_accessible ().set_name (entry.accessible_desc);
-
-        if (entry.menu != null)
-            submenu = entry.menu;
-
-        if (has_visible_child ())
-            show ();
-    }
-
-    public bool has_visible_child () {
-        return (entry.image != null && entry.image.get_visible ()) ||
-            (entry.label != null && entry.label.get_visible ());
-    }
-
-    public void visibility_changed_cb (Gtk.Widget widget) {
-        visible = has_visible_child ();
-    }
-}
-
-public class Indicators : GtkClutter.Actor {
-    int margin_to_right = 5;
-
-    PowerMenu power;
-
-    unowned KeyFile settings;
-
-    public KeyboardLayoutMenu keyboard_menu { get; private set; }
-
-    public Gtk.MenuBar bar;
-    private List<Indicator.Object> indicator_objects;
-
-    public async void start () {
-        string[] disabled = {"org.gnome.settings-daemon.plugins.background",
-                             "org.gnome.settings-daemon.plugins.clipboard",
-                             "org.gnome.settings-daemon.plugins.font",
-                             "org.gnome.settings-daemon.plugins.gconf",
-                             "org.gnome.settings-daemon.plugins.gsdwacom",
-                             "org.gnome.settings-daemon.plugins.housekeeping",
-                             "org.gnome.settings-daemon.plugins.keybindings",
-                             "org.gnome.settings-daemon.plugins.keyboard",
-                             "org.gnome.settings-daemon.plugins.media-keys",
-                             "org.gnome.settings-daemon.plugins.mouse",
-                             "org.gnome.settings-daemon.plugins.print-notifications",
-                             "org.gnome.settings-daemon.plugins.smartcard",
-                             "org.gnome.settings-daemon.plugins.sound",
-                             "org.gnome.settings-daemon.plugins.wacom",
-                             "org.gnome.settings-daemon.plugins.xsettings"};
-
-        string[] enabled =  {"org.gnome.settings-daemon.plugins.a11y-keyboard",
-                             "org.gnome.settings-daemon.plugins.a11y-settings",
-                             "org.gnome.settings-daemon.plugins.color",
-                             "org.gnome.settings-daemon.plugins.cursor",
-                             "org.gnome.settings-daemon.plugins.power",
-                             "org.gnome.settings-daemon.plugins.xrandr"};
-
-        foreach (var schema in disabled) {
-            toggle_schema (schema, false);
-        }
-
-        foreach (var schema in enabled) {
-            toggle_schema (schema, true);
-        }
-
-        GLib.Bus.own_name (GLib.BusType.SESSION, "org.gnome.ScreenSaver",
-                           GLib.BusNameOwnerFlags.NONE);
-        yield run ();
-    }
-
-    private async void run () {
-        try {
-            var proxy = new GLib.DBusProxy.for_bus_sync (GLib.BusType.SESSION,
-                                                         GLib.DBusProxyFlags.NONE, null,
-                                                         "org.gnome.SettingsDaemon",
-                                                         "/org/gnome/SettingsDaemon",
-                                                         "org.gnome.SettingsDaemon",
-                                                         null);
-
-            yield proxy.call ("Awake", null, GLib.DBusCallFlags.NONE, -1, null);
-        } catch (Error e) {
-            warning ("Could not start gnome-settings-daemon: %s", e.message);
-        }
-    }
-
-
-    public Indicators (KeyFile _settings) {
-        settings = _settings;
-        bar = new Gtk.MenuBar ();
-        (get_widget () as Gtk.Container).add (bar);
-
-        bar.pack_direction = Gtk.PackDirection.RTL;
-        height = 26;
-        bar.show_all ();
-
-        var transp = new Gtk.CssProvider ();
-        try {
-            transp.load_from_data ("*{background-color:@transparent;-GtkWidget-window-dragging:false;}", -1);
-        } catch (Error e) { warning (e.message); }
-        bar.get_style_context ().add_provider (transp, 20000);
-
-
-        this.get_widget ().draw.connect ((ctx) => {
-            ctx.rectangle (0, 0, bar.get_allocated_width (), bar.get_allocated_height ());
-            ctx.set_operator (Cairo.Operator.SOURCE);
-            ctx.set_source_rgba (0, 0, 0, 0);
-            ctx.fill ();
-
-            return false;
-        });
-
-        greeter_set_env ("INDICATOR_GREETER_MODE", "1");
-        greeter_set_env ("GIO_USE_VFS", "local");
-        greeter_set_env ("GVFS_DISABLE_FUSE", "1");
-        greeter_set_env ("RUNNING_UNDER_GDM", "1");
-
-        var INDICATORDIR = "/usr/lib/indicators3/7";
-        string[] filenames = {Path.build_filename (INDICATORDIR, "libpower.so"),
-                              Path.build_filename (INDICATORDIR, "libsoundmenu.so")};
-
-        foreach (var filename in filenames) {
-            var io = new Indicator.Object.from_file (filename);
-            if (io == null)
-                continue;
-
-            indicator_objects.append (io);
-            io.entry_added.connect ((object, entry) => {
-                bar.append (new IndicatorMenuItem (entry));
-            });
-
-            io.entry_removed.connect ((object, entry) => {
-                for (var i = 1; i < bar.get_children ().length (); i++) {
-                    if (bar.get_children ().nth_data (i) is IndicatorMenuItem)
-                        if (entry == (bar.get_children ().nth_data (i) as IndicatorMenuItem).entry)
-                            bar.remove (bar.get_children ().nth_data (i));
-                }
-            });
-
-            foreach (var entry in io.get_entries ()) {
-                var widget = new IndicatorMenuItem (entry);
-                bar.append (widget);
-                widget.margin_right = margin_to_right;
-            }
-
-        }
-
-        start.begin ();
-
-        //keyboard layout menu
-        keyboard_menu = new KeyboardLayoutMenu ();
-        bar.append (keyboard_menu);
-        keyboard_menu.margin_right = margin_to_right;
-        keyboard_menu.show_all ();
-
-        power = new PowerMenu ();
-        power.margin_right = margin_to_right;
-        bar.insert (power, 0);
-        power.show_all ();
-
-        var accessibility = new AccessibilityMenu (settings);
-        accessibility.margin_right = margin_to_right;
-        bar.append (accessibility);
-
-        accessibility.show_all ();
-    }
-
-    private void greeter_set_env (string key, string val) {
-        GLib.Environment.set_variable (key, val, true);
-        try {
-            var proxy = new GLib.DBusProxy.for_bus_sync (GLib.BusType.SESSION,
-                                                         GLib.DBusProxyFlags.NONE, null,
-                                                         "org.freedesktop.DBus",
-                                                         "/org/freedesktop/DBus",
-                                                         "org.freedesktop.DBus",
-                                                         null);
-
-            var builder = new GLib.VariantBuilder (GLib.VariantType.ARRAY);
-            builder.add ("{ss}", key, val);
-            proxy.call.begin ("UpdateActivationEnvironment", new Variant ("(a{ss})", builder), DBusCallFlags.NONE, -1, null);
-        } catch (Error e) {
-            warning ("Could not get set environment for indicators: %s", e.message);
-        }
-    }
-
-    private void toggle_schema (string name, bool active) {
-        var schema = SettingsSchemaSource.get_default ().lookup (name, false);
-
-        if (schema != null)
-            new Settings (name).set_boolean ("active", active);
-    }
-}

=== removed file 'src/Indicators/KeyboardLayoutMenu.vala'
--- src/Indicators/KeyboardLayoutMenu.vala	2014-10-21 20:20:45 +0000
+++ src/Indicators/KeyboardLayoutMenu.vala	1970-01-01 00:00:00 +0000
@@ -1,199 +0,0 @@
-public class KeyboardLayoutMenu : Gtk.MenuItem {
-
-    const string pantheon_greeter_layout_string = "pgl";
-
-    Gtk.Label keyboard_label;
-
-    LayoutItemNode[] layout_item_nodes = {};
-
-    Gtk.RadioMenuItem no_other_entries_item;
-
-    public KeyboardLayoutMenu () {
-
-        var keyboard_hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3);
-
-        try {
-            add (new Gtk.Image.from_pixbuf (Gtk.IconTheme.get_default ().lookup_by_gicon (
-                                                          new GLib.ThemedIcon.with_default_fallbacks ("input-keyboard-symbolic"),
-                                                          16, 0).load_symbolic ({1,1,1,1})));
-        } catch (Error e) {
-            warning (e.message);
-        }
-
-        keyboard_label = new Gtk.Label ("");
-        keyboard_label.set_use_markup (true);
-        keyboard_label.width_chars = 2;
-        keyboard_hbox.add (keyboard_label);
-
-        add (keyboard_hbox);
-        create_menu ();
-    }
-
-    private void create_menu () {
-        var submenu = new Gtk.Menu ();
-        set_submenu (submenu as Gtk.Widget);
-
-        var layouts = LightDM.get_layouts ().copy ();
-        layouts.sort (cmp_layout);
-
-        layout_item_nodes.resize ((int) layouts.length ());
-
-        int i = 0;
-
-        Gtk.RadioMenuItem? default_item = null;
-        Gtk.RadioMenuItem? last_item = null;
-        foreach (var layout in layouts) {
-            var item = new Gtk.RadioMenuItem.with_label (last_item == null ? null : last_item.get_group (), layout.description);
-            last_item = item;
-
-            if (i == 0)
-                default_item = item;
-
-            /* LightDM does not change its layout list during its lifetime, so this is safe */
-            item.set_data (pantheon_greeter_layout_string, layout);
-
-            item.toggled.connect (layout_toggled_cb);
-
-            submenu.append (item);
-            layout_item_nodes[i] = new LayoutItemNode (layout, item, false);
-            i++;
-        }
-        no_other_entries_item = new Gtk.RadioMenuItem.with_label (null, _("No other keyboard layouts available"));
-        submenu.append (no_other_entries_item);
-    }
-
-    public void user_changed_cb (LoginOption user) {
-
-        var layouts = new List <LightDM.Layout> ();
-        UserLogin user_login = user as UserLogin;
-        if (user_login != null) {
-            foreach (var name in user_login.lightdm_user.get_layouts ()) {
-                var layout = get_layout_by_name (name);
-                if (layout != null)
-                    layouts.append (layout);
-            }
-        }
-        set_layouts (layouts);
-        update_layout_visibility ();
-    }
-
-    private void update_layout_visibility () {
-        foreach (var n in layout_item_nodes) {
-            if (n.visible) {
-                n.item.show ();
-            } else {
-                n.item.hide ();
-            }
-        }
-    }
-
-    static LightDM.Layout? get_layout_by_name (string name) {
-        foreach (var layout in LightDM.get_layouts ()) {
-            if (layout.name == name)
-                return layout;
-        }
-        return null;
-    }
-
-    private void set_layouts (List<LightDM.Layout> layouts)
-    {
-        if (layouts == null || layouts.length () == 0) {
-            foreach (var n in layout_item_nodes) {
-                n.visible = false;
-            }
-            no_other_entries_item.show ();
-            return;
-        }
-        else {
-            foreach (var n in layout_item_nodes) {
-                n.visible = false;
-            }
-            foreach (var layout in layouts) {
-                get_node_for_layout (layout).visible = true;
-            }
-            no_other_entries_item.hide ();
-        }
-
-        var default_layout = layouts.data;
-        if (default_layout == null) {
-            default_layout = layout_item_nodes[0].layout;
-        }
-        var default_item = get_node_for_layout (default_layout).item;
-
-        /* Activate first item */
-        if (default_item != null) {
-            if (default_item.active) /* Started active, have to manually trigger callback */
-                layout_toggled_cb (default_item);
-            else
-                default_item.active = true; /* will trigger callback to do rest of work */
-        }
-    }
-
-    private LayoutItemNode? get_node_for_layout (LightDM.Layout layout) {
-        foreach (var n in layout_item_nodes) {
-            if (cmp_layout (layout, n.layout) == 0) {
-                return n;
-            }
-        }
-        warning ("Couldn't find a layout that matches: " + layout.name);
-        return null;
-    }
-
-    private void layout_toggled_cb (Gtk.CheckMenuItem item) {
-        if (!item.active)
-            return;
-
-        var layout = item.get_data<LightDM.Layout> (pantheon_greeter_layout_string);
-        if (layout == null)
-            return;
-
-        var desc = layout.short_description;
-        if (desc == null || desc == "") {
-            var parts = layout.name.split ("\t", 2);
-            if (parts[0] == layout.name) {
-                desc = layout.name;
-            } else {
-                /* Lookup parent layout, get its short_description */
-                var parent_layout = get_layout_by_name (parts[0]);
-                if (parent_layout.short_description == null ||
-                    parent_layout.short_description == "") {
-                    desc = parts[0];
-                } else {
-                    desc = parent_layout.short_description;
-                }
-            }
-        }
-        keyboard_label.label = "<span foreground=\"white\">"+desc+"</span>";
-
-        LightDM.set_layout (layout);
-    }
-
-    private static int cmp_layout (LightDM.Layout? a, LightDM.Layout? b)
-    {
-        if (a == null && b == null)
-            return 0;
-        else if (a == null)
-            return 1;
-        else if (b == null)
-            return -1;
-        else {
-            /* Use a dumb, ascii comparison for now.  If it turns out that some
-               descriptions can be in unicode, we'll have to use libicu's collation
-               algorithms. */
-            return strcmp (a.name, b.name);
-        }
-    }
-
-    class LayoutItemNode {
-        public LightDM.Layout layout { get; set; }
-        public Gtk.RadioMenuItem item { get; set; }
-        public bool visible { get; set; }
-
-        public LayoutItemNode (LightDM.Layout layout, Gtk.RadioMenuItem item, bool visible) {
-            this.layout = layout;
-            this.item = item;
-            this.visible = visible;
-        }
-    }
-
-}
\ No newline at end of file

=== added file 'src/Indicators/PopoverManager.vala'
--- src/Indicators/PopoverManager.vala	1970-01-01 00:00:00 +0000
+++ src/Indicators/PopoverManager.vala	2015-08-03 22:34:06 +0000
@@ -0,0 +1,45 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/***
+    BEGIN LICENSE
+
+    Copyright (C) 2011-2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE.  See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program.  If not, see <http://www.gnu.org/licenses/>
+
+    END LICENSE
+***/
+
+public class Indicators.PopoverManager : Gee.ArrayList<IndicatorPopover> {
+    public PopoverManager () {
+        connect_signals ();
+    }
+
+    public override bool add (IndicatorPopover popover) {
+        bool added = base.add (popover);
+
+        if (!added)
+            return false;
+
+        register_popover (popover);
+
+        return true;
+    }
+
+    private void connect_signals () {
+        // TODO
+    }
+
+    private void register_popover (IndicatorPopover popover) {
+        // TODO: Connect to popover signals
+    }
+}

=== removed file 'src/Indicators/PowerMenu.vala'
--- src/Indicators/PowerMenu.vala	2014-03-13 15:17:03 +0000
+++ src/Indicators/PowerMenu.vala	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-
-
-public class PowerMenu : Gtk.MenuItem {
-
-    public PowerMenu () {
-        try {
-            add (new Gtk.Image.from_pixbuf (Gtk.IconTheme.get_default ().lookup_by_gicon (
-                                                  new GLib.ThemedIcon.with_default_fallbacks ("system-shutdown-symbolic"), 16, 0)
-                                                  .load_symbolic ({1,1,1,1})));
-        } catch (Error e) {
-            warning (e.message);
-        }
-
-        submenu = new Gtk.Menu ();
-
-        var poweroff = new Gtk.MenuItem.with_label (_("Shutdown"));
-        var suspend = new Gtk.MenuItem.with_label (_("Suspend"));
-        var restart = new Gtk.MenuItem.with_label (_("Restart"));
-        var hibernate = new Gtk.MenuItem.with_label (_("Hibernate"));
-
-        if (LightDM.get_can_hibernate ())
-            submenu.append (hibernate);
-
-        if (LightDM.get_can_suspend ())
-            submenu.append (suspend);
-
-        if (LightDM.get_can_restart ())
-            submenu.append (restart);
-
-        if (LightDM.get_can_shutdown ())
-            submenu.append (poweroff);
-
-        poweroff.activate.connect (() => {
-            try { LightDM.shutdown (); } catch (Error e) { warning (e.message); }
-        });
-        suspend.activate.connect (() => {
-            try { LightDM.suspend (); } catch (Error e) { warning (e.message); }
-        });
-        restart.activate.connect (() => {
-            try { LightDM.restart (); } catch (Error e) { warning (e.message); }
-        });
-        hibernate.activate.connect (() => {
-            try { LightDM.hibernate (); } catch (Error e) { warning (e.message); }
-        });
-    }
-
-}
\ No newline at end of file

=== added file 'src/Indicators/StyleClass.vala'
--- src/Indicators/StyleClass.vala	1970-01-01 00:00:00 +0000
+++ src/Indicators/StyleClass.vala	2015-08-03 22:34:06 +0000
@@ -0,0 +1,25 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/***
+    BEGIN LICENSE
+
+    Copyright (C) 2011-2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE.  See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program.  If not, see <http://www.gnu.org/licenses/>
+
+    END LICENSE
+***/
+
+namespace Indicators.StyleClass {
+    public const string PANEL = "panel";
+    public const string COMPOSITED_INDICATOR = "composited-indicator";
+}

=== modified file 'src/PantheonGreeter.vala'
--- src/PantheonGreeter.vala	2015-04-23 06:09:09 +0000
+++ src/PantheonGreeter.vala	2015-08-03 22:34:06 +0000
@@ -18,6 +18,7 @@
 
     END LICENSE
 ***/
+
 public class PantheonGreeter : Gtk.Window {
 
     public static LoginGateway login_gateway { get; private set; }
@@ -29,7 +30,7 @@
     UserList userlist;
 
     TimeLabel time;
-    Indicators indicators;
+    Indicators.IndicatorBar indicator_bar;
     Wallpaper wallpaper;
 
     int timeout;
@@ -122,9 +123,9 @@
         userlist_actor = new UserListActor (userlist);
 
         time = new TimeLabel ();
-        if (!TEST_MODE) {
-            indicators = new Indicators (settings);
-        }
+
+        indicator_bar = new Indicators.IndicatorBar ();
+
         wallpaper = new Wallpaper ();
 
         message ("Connecting signals...");
@@ -149,9 +150,6 @@
 
         userlist.current_user_changed.connect ((user) => {
             wallpaper.set_wallpaper (user.background);
-            if (!TEST_MODE) {
-                indicators.keyboard_menu.user_changed_cb (user);
-            }
         });
 
         /*activate the numlock if needed*/
@@ -192,9 +190,7 @@
         greeterbox.add_child (wallpaper);
         greeterbox.add_child (time);
         greeterbox.add_child (userlist_actor);
-        if (!TEST_MODE) {
-            greeterbox.add_child (indicators);
-        }
+        greeterbox.add_child (indicator_bar);
 
         greeterbox.opacity = 0;
 
@@ -203,8 +199,7 @@
         greeterbox.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.WIDTH, 0));
         greeterbox.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.HEIGHT, 0));
 
-        if (!TEST_MODE)
-            indicators.add_constraint (new Clutter.BindConstraint (greeterbox, Clutter.BindCoordinate.WIDTH, 0));
+        indicator_bar.add_constraint (new Clutter.BindConstraint (greeterbox, Clutter.BindCoordinate.WIDTH, 0));
 
         clutter.key_press_event.connect (keyboard_navigation);
 
@@ -266,7 +261,7 @@
         var anim = fade_out_actor (time);
         fade_out_actor (userlist_actor);
         if (!TEST_MODE)
-            fade_out_actor (indicators);
+            fade_out_actor (indicator_bar);
 
         anim.completed.connect (() => {
             login_gateway.start_session ();

=== removed file 'vapi/indicator-0.4.vapi'
--- vapi/indicator-0.4.vapi	2012-11-26 20:14:01 +0000
+++ vapi/indicator-0.4.vapi	1970-01-01 00:00:00 +0000
@@ -1,175 +0,0 @@
-/* indicator-0.4.vapi generated by vapigen, do not modify. */
-
-namespace Indicator {
-	[CCode (cheader_filename = "libindicator/indicator-desktop-shortcuts.h", type_check_function = "INDICATOR_IS_DESKTOP_SHORTCUTS", type_id = "indicator_desktop_shortcuts_get_type")]
-	public class DesktopShortcuts : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public DesktopShortcuts (string file, string identity);
-		public unowned string get_nicks ();
-		public bool nick_exec (string nick);
-		public unowned string nick_get_name (string nick);
-		public string desktop_file { construct; }
-		[NoAccessorMethod]
-		public string identity { owned get; construct; }
-	}
-	[CCode (cheader_filename = "libindicator/indicator-object.h", type_check_function = "INDICATOR_IS_OBJECT", type_id = "indicator_object_get_type")]
-	public class Object : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Object ();
-		public bool check_environment (string env);
-		[NoWrapper]
-		public virtual void entry_activate (Indicator.ObjectEntry entry, uint timestamp);
-		[NoWrapper]
-		public virtual void entry_activate_window (Indicator.ObjectEntry entry, uint windowid, uint timestamp);
-		[NoWrapper]
-		public virtual void entry_being_removed (Indicator.ObjectEntry entry);
-		[NoWrapper]
-		public virtual void entry_close (Indicator.ObjectEntry entry, uint timestamp);
-		[NoWrapper]
-		public virtual void entry_was_added (Indicator.ObjectEntry entry);
-		[CCode (has_construct_function = false)]
-		public Object.from_file (string file);
-		[NoWrapper]
-		public virtual unowned string get_accessible_desc ();
-		public virtual GLib.List<weak Indicator.ObjectEntry> get_entries ();
-		public unowned string[] get_environment ();
-		[NoWrapper]
-		public virtual unowned Gtk.Image get_image ();
-		[NoWrapper]
-		public virtual unowned Gtk.Label get_label ();
-		public virtual uint get_location (Indicator.ObjectEntry entry);
-		[NoWrapper]
-		public virtual unowned Gtk.Menu get_menu ();
-		[NoWrapper]
-		public virtual unowned string get_name_hint ();
-		public virtual bool get_show_now (Indicator.ObjectEntry entry);
-		[NoWrapper]
-		public virtual void reserved1 ();
-		[NoWrapper]
-		public virtual void reserved2 ();
-		[NoWrapper]
-		public virtual void reserved3 ();
-		[NoWrapper]
-		public virtual void reserved4 ();
-		[NoWrapper]
-		public virtual void reserved5 ();
-		public void set_environment (string[] env);
-		public void set_visible (bool visible);
-		[NoAccessorMethod]
-		public bool indicator_object_default_visibility { get; set; }
-		public virtual signal void accessible_desc_update (Indicator.ObjectEntry entry);
-		public virtual signal void entry_added (Indicator.ObjectEntry entry);
-		public virtual signal void entry_moved (Indicator.ObjectEntry entry, uint old_pos, uint new_pos);
-		public virtual signal void entry_removed (Indicator.ObjectEntry entry);
-		public virtual signal void entry_scrolled (Indicator.ObjectEntry entry, uint delta, Indicator.ScrollDirection direction);
-		public virtual signal void menu_show (Indicator.ObjectEntry entry, uint timestamp);
-		public virtual signal void secondary_activate (Indicator.ObjectEntry entry, uint timestamp);
-		public virtual signal void show_now_changed (Indicator.ObjectEntry entry, bool show_now_state);
-	}
-	[CCode (cheader_filename = "libindicator/indicator-object.h")]
-	[Compact]
-	public class ObjectEntry {
-		public weak string accessible_desc;
-		public weak Gtk.Image image;
-		public weak Gtk.Label label;
-		public weak Gtk.Menu menu;
-		public weak string name_hint;
-		public weak Indicator.Object parent_object;
-		public weak GLib.Callback reserved1;
-		public weak GLib.Callback reserved2;
-		public weak GLib.Callback reserved3;
-		public weak GLib.Callback reserved4;
-		public static void activate (Indicator.Object io, Indicator.ObjectEntry entry, uint timestamp);
-		public static void activate_window (Indicator.Object io, Indicator.ObjectEntry entry, uint windowid, uint timestamp);
-		public static void close (Indicator.Object io, Indicator.ObjectEntry entry, uint timestamp);
-	}
-	[CCode (cheader_filename = "libindicator/indicator-service.h", type_check_function = "INDICATOR_IS_SERVICE", type_id = "indicator_service_get_type")]
-	public class Service : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Service (string name);
-		[NoWrapper]
-		public virtual void indicator_service_reserved1 ();
-		[NoWrapper]
-		public virtual void indicator_service_reserved2 ();
-		[NoWrapper]
-		public virtual void indicator_service_reserved3 ();
-		[NoWrapper]
-		public virtual void indicator_service_reserved4 ();
-		[CCode (cname = "indicator_service_new_version", has_construct_function = false)]
-		public Service.with_version (string name, uint version);
-		[NoAccessorMethod]
-		public string name { owned get; set; }
-		[NoAccessorMethod]
-		public uint version { get; set; }
-		public virtual signal void shutdown ();
-	}
-	[CCode (cheader_filename = "libindicator/indicator-service-manager.h", type_check_function = "INDICATOR_IS_SERVICE_MANAGER", type_id = "indicator_service_manager_get_type")]
-	public class ServiceManager : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public ServiceManager (string dbus_name);
-		public bool connected ();
-		[NoWrapper]
-		public virtual void indicator_service_manager_reserved1 ();
-		[NoWrapper]
-		public virtual void indicator_service_manager_reserved2 ();
-		[NoWrapper]
-		public virtual void indicator_service_manager_reserved3 ();
-		[NoWrapper]
-		public virtual void indicator_service_manager_reserved4 ();
-		public void set_refresh (uint time_in_ms);
-		[CCode (cname = "indicator_service_manager_new_version", has_construct_function = false)]
-		public ServiceManager.with_version (string dbus_name, uint version);
-		[NoAccessorMethod]
-		public string name { owned get; set; }
-		[NoAccessorMethod]
-		public uint version { get; set; }
-		public virtual signal void connection_change (bool connected);
-	}
-	[CCode (cheader_filename = "libindicator/indicator-object.h", cprefix = "INDICATOR_OBJECT_SCROLL_", has_type_id = false)]
-	public enum ScrollDirection {
-		UP,
-		DOWN,
-		LEFT,
-		RIGHT
-	}
-	[CCode (cheader_filename = "libindicator/indicator.h", has_target = false)]
-	public delegate GLib.Type get_type_t ();
-	[CCode (cheader_filename = "libindicator/indicator.h", has_target = false)]
-	public delegate unowned string get_version_t ();
-	[CCode (cheader_filename = "libindicator/indicator.h")]
-	public const string GET_TYPE_S;
-	[CCode (cheader_filename = "libindicator/indicator.h")]
-	public const string GET_VERSION_S;
-	[CCode (cheader_filename = "libindicator/indicator-gobject.h")]
-	public const string OBJECT_DEFAULT_VISIBILITY;
-	[CCode (cheader_filename = "libindicator/indicator-gobject.h")]
-	public const string OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE;
-	[CCode (cheader_filename = "libindicator/indicator-gobject.h")]
-	public const string OBJECT_SIGNAL_ENTRY_ADDED;
-	[CCode (cheader_filename = "libindicator/indicator-gobject.h")]
-	public const string OBJECT_SIGNAL_ENTRY_MOVED;
-	[CCode (cheader_filename = "libindicator/indicator-gobject.h")]
-	public const string OBJECT_SIGNAL_ENTRY_REMOVED;
-	[CCode (cheader_filename = "libindicator/indicator-gobject.h")]
-	public const string OBJECT_SIGNAL_ENTRY_SCROLLED;
-	[CCode (cheader_filename = "libindicator/indicator-gobject.h")]
-	public const string OBJECT_SIGNAL_MENU_SHOW;
-	[CCode (cheader_filename = "libindicator/indicator-gobject.h")]
-	public const string OBJECT_SIGNAL_SECONDARY_ACTIVATE;
-	[CCode (cheader_filename = "libindicator/indicator-gobject.h")]
-	public const string OBJECT_SIGNAL_SHOW_NOW_CHANGED;
-	[CCode (cheader_filename = "libindicator/indicator-service-manager.h")]
-	public const string SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE;
-	[CCode (cheader_filename = "libindicator/indicator-service.h")]
-	public const string SERVICE_SIGNAL_SHUTDOWN;
-	[CCode (cheader_filename = "libindicator/indicator.h")]
-	public const int SET_VERSION;
-	[CCode (cheader_filename = "libindicator/indicator.h")]
-	public const string VERSION;
-	[CCode (cheader_filename = "libindicator/indicator.h", cname = "get_version")]
-	public static unowned string get_version ();
-	[CCode (cheader_filename = "libindicator/indicator-image-helper.h")]
-	public static unowned Gtk.Image image_helper (string name);
-	[CCode (cheader_filename = "libindicator/indicator-image-helper.h")]
-	public static void image_helper_update (Gtk.Image image, string name);
-}
\ No newline at end of file