Merge branch 'tari01-pr/fix-build-warnings'

Attributes GH PR #59: https://github.com/AyatanaIndicators/libayatana-appindicator/pull/59

11 files changed, 1763 insertions, 1701 deletions

diff --git a/bindings/vala/ayatana-appindicator-0.1-custom.vala b/bindings/vala/ayatana-appindicator-0.1-custom.vala
index 9fa51eb..4cf9e3e 100644
--- a/bindings/vala/ayatana-appindicator-0.1-custom.vala
+++ b/bindings/vala/ayatana-appindicator-0.1-custom.vala
@@ -1,5 +1,6 @@
 /*
- Copyright (C) 2011 Canonical, Ltd.
+ Copyright 2011 Canonical, Ltd.
+ Copyright 2022 Robert Tari
 
   This program is free software: you can redistribute it and/or modify it
   under the terms of either or both of the following licenses:
@@ -19,11 +20,13 @@
   License version 3 and version 2.1 along with this program.  If not, see
   <http://www.gnu.org/licenses/>
 
-  Authored by Michal Hruby <michal.hruby@canonical.com>
+  Authors:
+      Michal Hruby <michal.hruby@canonical.com>
+      Robert Tari <robert@tari.in>
 */
 
 namespace AppIndicator {
-  [CCode (type_check_function = "IS_APP_INDICATOR", type_id = "app_indicator_get_type ()")]
+  [CCode (type_check_function = "APP_IS_INDICATOR", type_id = "app_indicator_get_type ()")]
   public class Indicator : GLib.Object {
   }
 }
diff --git a/bindings/vala/examples/CMakeLists.txt b/bindings/vala/examples/CMakeLists.txt
index b747208..2751096 100644
--- a/bindings/vala/examples/CMakeLists.txt
+++ b/bindings/vala/examples/CMakeLists.txt
@@ -21,7 +21,7 @@ add_custom_command(
 
 # ayatana-indicator-example
 
-set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-example.c" PROPERTIES COMPILE_FLAGS " -include ${CMAKE_SOURCE_DIR}/src/app-indicator.h")
+set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-example.c" PROPERTIES COMPILE_FLAGS " -include ${CMAKE_SOURCE_DIR}/src/app-indicator.h -Wno-incompatible-pointer-types")
 add_executable("ayatana-indicator-example" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-example.c")
 target_include_directories("ayatana-indicator-example" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
 target_link_libraries("ayatana-indicator-example" "${PROJECT_DEPS_LIBRARIES} -layatana-appindicator3 -L${CMAKE_BINARY_DIR}/src")
diff --git a/bindings/vala/examples/ayatana-indicator-example.vala b/bindings/vala/examples/ayatana-indicator-example.vala
index 764009f..55535ab 100644
--- a/bindings/vala/examples/ayatana-indicator-example.vala
+++ b/bindings/vala/examples/ayatana-indicator-example.vala
@@ -1,5 +1,6 @@
 /*
  * Copyright 2011 Canonical Ltd.
+ * Copyright 2022 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,52 +16,53 @@
  *
  * Authors:
  *   Marco Trevisan (Treviño) <mail@3v1n0.net>
+ *   Robert Tari <robert@tari.in>
  */
 
 using Gtk;
 using AppIndicator;
 
 public class IndicatorExample {
-	public static int main(string[] args) {
-		Gtk.init(ref args);
+    public static int main(string[] args) {
+        Gtk.init(ref args);
 
-		var win = new Window();
-		win.title = "Indicator Test";
-		win.resize(200, 200);
-		win.destroy.connect(Gtk.main_quit);
+        var win = new Window();
+        win.title = "Indicator Test";
+        win.resize(200, 200);
+        win.destroy.connect(Gtk.main_quit);
 
-		var label = new Label("Hello, world!");
-		win.add(label);
+        var label = new Label("Hello, world!");
+        win.add(label);
 
-		var indicator = new Indicator(win.title, "indicator-messages",
-				                      IndicatorCategory.APPLICATION_STATUS);
-		if (!(indicator is Indicator)) return -1;
+        var indicator = new Indicator(win.title, "indicator-messages",
+                                      IndicatorCategory.APPLICATION_STATUS);
+        if (!(indicator is Indicator)) return -1;
 
-		indicator.set_status(IndicatorStatus.ACTIVE);
-		indicator.set_attention_icon("indicator-messages-new");
+        indicator.set_status(IndicatorStatus.ACTIVE);
+        indicator.set_attention_icon_full("indicator-messages-new", null);
 
-		var menu = new Gtk.Menu();
+        var menu = new Gtk.Menu();
 
-		var item = new Gtk.MenuItem.with_label("Foo");
-		item.activate.connect(() => {
-			indicator.set_status(IndicatorStatus.ATTENTION);
-		});
-		item.show();
-		menu.append(item);
+        var item = new Gtk.MenuItem.with_label("Foo");
+        item.activate.connect(() => {
+            indicator.set_status(IndicatorStatus.ATTENTION);
+        });
+        item.show();
+        menu.append(item);
 
-		var bar = item = new Gtk.MenuItem.with_label("Bar");
-		item.show();
-		item.activate.connect(() => {
-			indicator.set_status(IndicatorStatus.ACTIVE);
-		});
-		menu.append(item);
+        var bar = item = new Gtk.MenuItem.with_label("Bar");
+        item.show();
+        item.activate.connect(() => {
+            indicator.set_status(IndicatorStatus.ACTIVE);
+        });
+        menu.append(item);
 
-		indicator.set_menu(menu);
-		indicator.set_secondary_activate_target(bar);
+        indicator.set_menu(menu);
+        indicator.set_secondary_activate_target(bar);
 
-		win.show_all();
+        win.show_all();
 
-		Gtk.main();
-		return 0;
-	}
+        Gtk.main();
+        return 0;
+    }
 }
diff --git a/docs/reference/libayatana-appindicator-sections.txt b/docs/reference/libayatana-appindicator-sections.txt
index 3bed826..ab86216 100644
--- a/docs/reference/libayatana-appindicator-sections.txt
+++ b/docs/reference/libayatana-appindicator-sections.txt
@@ -3,8 +3,8 @@
 APP_INDICATOR_TYPE
 APP_INDICATOR
 APP_INDICATOR_CLASS
-IS_APP_INDICATOR
-IS_APP_INDICATOR_CLASS
+APP_IS_INDICATOR
+APP_IS_INDICATOR_CLASS
 APP_INDICATOR_GET_CLASS
 APP_INDICATOR_SIGNAL_NEW_ICON
 APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON
diff --git a/docs/reference/scangobj.sh.in b/docs/reference/scangobj.sh.in
index 8cb2500..1863f61 100644
--- a/docs/reference/scangobj.sh.in
+++ b/docs/reference/scangobj.sh.in
@@ -1 +1 @@
-LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${CMAKE_BINARY_DIR}/src" CFLAGS="-I${GTKDOC_SCANGOBJ_INCLUDE_DIRS}" LDFLAGS="-l${GTKDOC_SCANGOBJ_LIBRARIES} -L${CMAKE_BINARY_DIR}/src -l${SCANGOBJ_AYATANA_APPINDICATOR}" gtkdoc-scangobj --type-init-func="g_type_init()" --module=libayatana-appindicator > /dev/null
+LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${CMAKE_BINARY_DIR}/src" CFLAGS="-I${GTKDOC_SCANGOBJ_INCLUDE_DIRS}" LDFLAGS="-l${GTKDOC_SCANGOBJ_LIBRARIES} -L${CMAKE_BINARY_DIR}/src -l${SCANGOBJ_AYATANA_APPINDICATOR}" gtkdoc-scangobj --module=libayatana-appindicator > /dev/null
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index a337cdc..0b5f133 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -31,7 +31,7 @@ if (FLAVOUR_GTK3)
 
     # simple-client-vala
 
-    set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/simple-client-vala.c" PROPERTIES COMPILE_FLAGS " -include ${CMAKE_SOURCE_DIR}/src/app-indicator.h")
+    set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/simple-client-vala.c" PROPERTIES COMPILE_FLAGS " -include ${CMAKE_SOURCE_DIR}/src/app-indicator.h -Wno-incompatible-pointer-types -Wno-unused-but-set-variable")
     add_executable("simple-client-vala" "${CMAKE_CURRENT_BINARY_DIR}/simple-client-vala.c")
     target_include_directories("simple-client-vala" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
     target_link_libraries("simple-client-vala" "${PROJECT_DEPS_LIBRARIES} -l${ayatana_appindicator_gtkver} -L${CMAKE_BINARY_DIR}/src")
diff --git a/example/simple-client-vala.vala b/example/simple-client-vala.vala
index c30bf34..5b3af11 100644
--- a/example/simple-client-vala.vala
+++ b/example/simple-client-vala.vala
@@ -3,20 +3,22 @@ A small piece of sample code demonstrating a very simple application
 with an indicator.
 
 Copyright 2011 Canonical Ltd.
+Copyright 2022 Robert Tari
 
 Authors:
     Marco Trevisan <mail@3v1n0.net>
+    Robert Tari <robert@tari.in>
 
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU 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 
+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 
+You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -24,159 +26,166 @@ using Gtk;
 using AppIndicator;
 
 static int main(string[] args) {
-	var sc = new SimpleClient(args);
-	sc.run();
-	return 0;
+    var sc = new SimpleClient(args);
+    sc.run();
+    return 0;
 }
 
 class SimpleClient {
-	Gtk.Menu menu;
-	Indicator ci;
-	int percentage;
-	bool active;
-	bool can_haz_label;
+    Gtk.Menu menu;
+    Indicator ci;
+    int percentage;
+    bool active;
+    bool can_haz_label;
 
-	public SimpleClient(string[] args) {
-		Gtk.init(ref args);
+    public SimpleClient(string[] args) {
+        Gtk.init(ref args);
 
-		ci = new Indicator("example-simple-client",
+        ci = new Indicator("example-simple-client",
                            "indicator-messages",
                            IndicatorCategory.APPLICATION_STATUS);
 
-		ci.set_status(IndicatorStatus.ACTIVE);
-		ci.set_attention_icon("indicator-messages-new");
-		ci.set_label("1%", "100%");
-		ci.set_title("Test Indicator (vala)");
-
-		active = true;
-		can_haz_label = true;
-	}
-
-	private void toggle_sensitivity(Widget widget) {
-		widget.set_sensitive(!widget.is_sensitive());
-	}
-
-	private void append_submenu(Gtk.MenuItem item) {
-		var menu = new Gtk.Menu();
-		Gtk.MenuItem mi;
-
-		mi = new Gtk.MenuItem.with_label("Sub 1");
-		menu.append(mi);
-		mi.activate.connect(() => { print("Sub1\n"); });
-
-		Gtk.MenuItem prev_mi = mi;
-		mi = new Gtk.MenuItem.with_label("Sub 2");
-		menu.append(mi);
-		mi.activate.connect(() => { toggle_sensitivity(prev_mi); });
-
-		mi = new Gtk.MenuItem.with_label("Sub 3");
-		menu.append(mi);
-		mi.activate.connect(() => { print("Sub3\n"); });
-
-		mi = new Gtk.MenuItem.with_label("Toggle Attention");
-		menu.append(mi);
-		mi.activate.connect(() => {
-			if (ci.get_status() == IndicatorStatus.ATTENTION)
-				ci.set_status(IndicatorStatus.ACTIVE);
-			else
-				ci.set_status(IndicatorStatus.ATTENTION);
-		});
-
-		ci.set_secondary_activate_target(mi);
-
-		menu.show_all();
-		item.set_submenu(menu);
-	}
-
-	private void label_toggle(Gtk.MenuItem item) {
-		can_haz_label = !can_haz_label;
-
-		if (can_haz_label) {
-			item.set_label("Hide label");
-		} else {
-			item.set_label("Show label");
-		}
-	}
-
-	public void run() {
-
-		ci.scroll_event.connect((delta, direction) => {
-			print(@"Got scroll event! delta: $delta, direction: $direction\n");
-		});
-
-		GLib.Timeout.add_seconds(1, () => {
-			percentage = (percentage + 1) % 100;
-			if (can_haz_label) {
-				ci.set_label(@"$(percentage+1)%", "");
-			} else {
-				ci.set_label("", "");
-			}
-			return true;
-		});
-
-		menu = new Gtk.Menu();
-		var chk = new CheckMenuItem.with_label("1");
-		chk.activate.connect(() => { print("1\n"); });
-		menu.append(chk);
-		chk.show();
-
-		var radio = new Gtk.RadioMenuItem.with_label(new SList<RadioMenuItem>(), "2");
-		radio.activate.connect(() => { print("2\n"); });
-		menu.append(radio);
-		radio.show();
-
-		var submenu = new Gtk.MenuItem.with_label("3");
-		menu.append(submenu);
-		append_submenu(submenu);
-		submenu.show();
-
-		var toggle_item = new Gtk.MenuItem.with_label("Toggle 3");
-		toggle_item.activate.connect(() => { toggle_sensitivity(submenu); });
-		menu.append(toggle_item);
-		toggle_item.show();
-
-		var imgitem = new Gtk.ImageMenuItem.from_stock(Stock.NEW, null);
-		imgitem.activate.connect(() => {
-			Image img = (Image) imgitem.get_image();
-			img.set_from_stock(Stock.OPEN, IconSize.MENU);
-		});
-		menu.append(imgitem);
-		imgitem.show();
-
-		var att = new Gtk.MenuItem.with_label("Get Attention");
-		att.activate.connect(() => {
-			if (active) {
-				ci.set_status(IndicatorStatus.ATTENTION);
-				att.set_label("I'm okay now");
-				active = false;
-			} else {
-				ci.set_status(IndicatorStatus.ACTIVE);
-				att.set_label("Get Attention");
-				active = false;
-			}
-		});
-		menu.append(att);
-		att.show();
-
-		var show = new Gtk.MenuItem.with_label("Show Label");
-		label_toggle(show);
-		show.activate.connect(() => { label_toggle(show); });
-		menu.append(show);
-		show.show();
-
-		var icon = new Gtk.CheckMenuItem.with_label("Set Local Icon");
-		icon.activate.connect(() => {
-			if (icon.get_active()) {
-				ci.set_icon("simple-client-test-icon.png");
-			} else {
-				ci.set_icon("indicator-messages");
-			}
-		});
-		menu.append(icon);
-		icon.show();
-
-		ci.set_menu(menu);
-
-		Gtk.main();
-	}
+        ci.set_status(IndicatorStatus.ACTIVE);
+        ci.set_attention_icon_full("indicator-messages-new", null);
+        ci.set_label("1%", "100%");
+        ci.set_title("Test Indicator (vala)");
+
+        active = true;
+        can_haz_label = true;
+    }
+
+    private void toggle_sensitivity(Widget widget) {
+        widget.set_sensitive(!widget.is_sensitive());
+    }
+
+    private void append_submenu(Gtk.MenuItem item) {
+        var menu = new Gtk.Menu();
+        Gtk.MenuItem mi;
+
+        mi = new Gtk.MenuItem.with_label("Sub 1");
+        menu.append(mi);
+        mi.activate.connect(() => { print("Sub1\n"); });
+
+        Gtk.MenuItem prev_mi = mi;
+        mi = new Gtk.MenuItem.with_label("Sub 2");
+        menu.append(mi);
+        mi.activate.connect(() => { toggle_sensitivity(prev_mi); });
+
+        mi = new Gtk.MenuItem.with_label("Sub 3");
+        menu.append(mi);
+        mi.activate.connect(() => { print("Sub3\n"); });
+
+        mi = new Gtk.MenuItem.with_label("Toggle Attention");
+        menu.append(mi);
+        mi.activate.connect(() => {
+            if (ci.get_status() == IndicatorStatus.ATTENTION)
+                ci.set_status(IndicatorStatus.ACTIVE);
+            else
+                ci.set_status(IndicatorStatus.ATTENTION);
+        });
+
+        ci.set_secondary_activate_target(mi);
+
+        menu.show_all();
+        item.set_submenu(menu);
+    }
+
+    private void label_toggle(Gtk.MenuItem item) {
+        can_haz_label = !can_haz_label;
+
+        if (can_haz_label) {
+            item.set_label("Hide label");
+        } else {
+            item.set_label("Show label");
+        }
+    }
+
+    public void run() {
+
+        ci.scroll_event.connect((delta, direction) => {
+            print(@"Got scroll event! delta: $delta, direction: $direction\n");
+        });
+
+        GLib.Timeout.add_seconds(1, () => {
+            percentage = (percentage + 1) % 100;
+            if (can_haz_label) {
+                ci.set_label(@"$(percentage+1)%", "");
+            } else {
+                ci.set_label("", "");
+            }
+            return true;
+        });
+
+        menu = new Gtk.Menu();
+        var chk = new CheckMenuItem.with_label("1");
+        chk.activate.connect(() => { print("1\n"); });
+        menu.append(chk);
+        chk.show();
+
+        var radio = new Gtk.RadioMenuItem.with_label(new SList<RadioMenuItem>(), "2");
+        radio.activate.connect(() => { print("2\n"); });
+        menu.append(radio);
+        radio.show();
+
+        var submenu = new Gtk.MenuItem.with_label("3");
+        menu.append(submenu);
+        append_submenu(submenu);
+        submenu.show();
+
+        var toggle_item = new Gtk.MenuItem.with_label("Toggle 3");
+        toggle_item.activate.connect(() => { toggle_sensitivity(submenu); });
+        menu.append(toggle_item);
+        toggle_item.show();
+
+        var pImage = new Gtk.Image.from_icon_name("document-new", IconSize.MENU);
+        var pLabel = new Gtk.Label("New");
+        var pGrid = new Gtk.Grid();
+        pGrid.add(pImage);
+        pGrid.add(pLabel);
+        var imgitem = new Gtk.MenuItem();
+        imgitem.add(pGrid);
+        imgitem.activate.connect(() => {
+            Grid pGridLocal = (Grid)imgitem.get_children().nth_data(0);
+            Image img = (Image) pGridLocal.get_children().nth_data(1);
+            img.set_from_icon_name("document-open", IconSize.MENU);
+        });
+        menu.append(imgitem);
+        imgitem.show();
+
+        var att = new Gtk.MenuItem.with_label("Get Attention");
+        att.activate.connect(() => {
+            if (active) {
+                ci.set_status(IndicatorStatus.ATTENTION);
+                att.set_label("I'm okay now");
+                active = false;
+            } else {
+                ci.set_status(IndicatorStatus.ACTIVE);
+                att.set_label("Get Attention");
+                active = false;
+            }
+        });
+        menu.append(att);
+        att.show();
+
+        var show = new Gtk.MenuItem.with_label("Show Label");
+        label_toggle(show);
+        show.activate.connect(() => { label_toggle(show); });
+        menu.append(show);
+        show.show();
+
+        var icon = new Gtk.CheckMenuItem.with_label("Set Local Icon");
+        icon.activate.connect(() => {
+            if (icon.get_active()) {
+                ci.set_icon_full("simple-client-test-icon.png", null);
+            } else {
+                ci.set_icon_full("indicator-messages", null);
+            }
+        });
+        menu.append(icon);
+        icon.show();
+
+        ci.set_menu(menu);
+
+        Gtk.main();
+    }
 }
diff --git a/example/simple-client.c b/example/simple-client.c
index 6d67955..78a560d 100644
--- a/example/simple-client.c
+++ b/example/simple-client.c
@@ -3,20 +3,22 @@ A small piece of sample code demonstrating a very simple application
 with an indicator.
 
 Copyright 2009 Canonical Ltd.
+Copyright 2022 Robert Tari
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Robert Tari <robert@tari.in>
 
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU 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 
+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 
+You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -92,9 +94,15 @@ toggle_sensitivity_cb (GtkWidget *widget, gpointer data)
 static void
 image_clicked_cb (GtkWidget *widget, gpointer data)
 {
-  gtk_image_set_from_stock (GTK_IMAGE (gtk_image_menu_item_get_image (
-                            GTK_IMAGE_MENU_ITEM (widget))),
-                            GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+  GList *pList = gtk_container_get_children(GTK_CONTAINER(widget));
+  GtkContainer *pContainer = GTK_CONTAINER(g_list_nth_data(pList, 0));
+  pList = gtk_container_get_children(pContainer);
+#if GTK_MAJOR_VERSION >= 3
+  GtkImage *pImage = GTK_IMAGE(g_list_nth_data(pList, 1));
+#else
+  GtkImage *pImage = GTK_IMAGE(g_list_nth_data(pList, 0));
+#endif
+  gtk_image_set_from_icon_name(pImage, "document-open", GTK_ICON_SIZE_MENU);
 }
 
 static void
@@ -161,13 +169,13 @@ main (int argc, char ** argv)
                                 "indicator-messages",
                                 APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
 
-    g_assert (IS_APP_INDICATOR (ci));
+    g_assert (APP_IS_INDICATOR (ci));
         g_assert (G_IS_OBJECT (ci));
 
     app_indicator_set_status (ci, APP_INDICATOR_STATUS_ACTIVE);
     app_indicator_set_attention_icon_full(ci, "indicator-messages-new", "System Messages Icon Highlighted");
     app_indicator_set_label (ci, "1%", "100%");
-	app_indicator_set_title (ci, "Test Inidcator");
+    app_indicator_set_title (ci, "Test Inidcator");
 
     g_signal_connect (ci, "scroll-event",
                       G_CALLBACK (scroll_event_cb), NULL);
@@ -198,7 +206,21 @@ main (int argc, char ** argv)
         gtk_menu_shell_append (GTK_MENU_SHELL (menu), toggle_item);
         gtk_widget_show(toggle_item);
 
-        item = gtk_image_menu_item_new_from_stock (GTK_STOCK_NEW, NULL);
+        GtkWidget *pImage = gtk_image_new_from_icon_name("document-new", GTK_ICON_SIZE_MENU);
+        GtkWidget *pLabel = gtk_label_new("New");
+#if GTK_MAJOR_VERSION >= 3
+        GtkWidget *pGrid = gtk_grid_new();
+        gtk_container_add(GTK_CONTAINER(pGrid), pImage);
+        gtk_container_add(GTK_CONTAINER(pGrid), pLabel);
+        item = gtk_menu_item_new();
+        gtk_container_add(GTK_CONTAINER(item), pGrid);
+#else
+        GtkWidget *pBox = gtk_hbox_new(FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(pBox), pImage, FALSE, FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(pBox), pLabel, FALSE, FALSE, 0);
+        item = gtk_menu_item_new();
+        gtk_container_add(GTK_CONTAINER(item), pBox);
+#endif
         g_signal_connect (item, "activate",
                           G_CALLBACK (image_clicked_cb), NULL);
         gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
diff --git a/src/app-indicator.c b/src/app-indicator.c
index 0c0bd05..70c7536 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -3,10 +3,12 @@ An object to represent the application as an application indicator
 in the system panel.
 
 Copyright 2009 Canonical Ltd.
+Copyright 2022 Robert Tari
 
 Authors:
     Ted Gould <ted@canonical.com>
     Cody Russell <cody.russell@canonical.com>
+    Robert Tari <robert@tari.in>
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of either or both of the following licenses:
@@ -69,56 +71,56 @@ License version 3 and version 2.1 along with this program.  If not, see
  *
  */
 typedef struct {
-	/*< Private >*/
-	/* Properties */
-	gchar                *id;
-	gchar                *clean_id;
-	AppIndicatorCategory  category;
-	AppIndicatorStatus    status;
-	gchar                *icon_name;
-	gchar                *absolute_icon_name;
-	gchar                *attention_icon_name;
-	gchar                *absolute_attention_icon_name;
-	gchar                *icon_theme_path;
-	gchar                *absolute_icon_theme_path;
-	DbusmenuServer       *menuservice;
-	GtkWidget            *menu;
-	GtkWidget            *sec_activate_target;
-	gboolean              sec_activate_enabled;
-	guint32               ordering_index;
-	gchar *               title;
-	gchar *               label;
-	gchar *               label_guide;
-	gchar *               accessible_desc;
-	gchar *               att_accessible_desc;
-	guint                 label_change_idle;
-
-	GtkStatusIcon *       status_icon;
-	gint                  fallback_timer;
-
-	/* Fun stuff */
-	GDBusConnection      *connection;
-	guint                 dbus_registration;
-	gchar *               path;
-
-	/* StatusNotifierWatcher */
-	GDBusProxy           *watcher_proxy;
-	guint                 watcher_id;
-
-	/* Might be used */
-	IndicatorDesktopShortcuts * shorties;
+    /*< Private >*/
+    /* Properties */
+    gchar                *id;
+    gchar                *clean_id;
+    AppIndicatorCategory  category;
+    AppIndicatorStatus    status;
+    gchar                *icon_name;
+    gchar                *absolute_icon_name;
+    gchar                *attention_icon_name;
+    gchar                *absolute_attention_icon_name;
+    gchar                *icon_theme_path;
+    gchar                *absolute_icon_theme_path;
+    DbusmenuServer       *menuservice;
+    GtkWidget            *menu;
+    GtkWidget            *sec_activate_target;
+    gboolean              sec_activate_enabled;
+    guint32               ordering_index;
+    gchar *               title;
+    gchar *               label;
+    gchar *               label_guide;
+    gchar *               accessible_desc;
+    gchar *               att_accessible_desc;
+    guint                 label_change_idle;
+
+    GtkStatusIcon *       status_icon;
+    gint                  fallback_timer;
+
+    /* Fun stuff */
+    GDBusConnection      *connection;
+    guint                 dbus_registration;
+    gchar *               path;
+
+    /* StatusNotifierWatcher */
+    GDBusProxy           *watcher_proxy;
+    guint                 watcher_id;
+
+    /* Might be used */
+    IndicatorDesktopShortcuts * shorties;
 } AppIndicatorPrivate;
 
 /* Signals Stuff */
 enum {
-	NEW_ICON,
-	NEW_ATTENTION_ICON,
-	NEW_STATUS,
-	NEW_LABEL,
-	CONNECTION_CHANGED,
-	NEW_ICON_THEME_PATH,
-	SCROLL_EVENT,
-	LAST_SIGNAL
+    NEW_ICON,
+    NEW_ATTENTION_ICON,
+    NEW_STATUS,
+    NEW_LABEL,
+    CONNECTION_CHANGED,
+    NEW_ICON_THEME_PATH,
+    SCROLL_EVENT,
+    LAST_SIGNAL
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -126,21 +128,21 @@ static guint signals[LAST_SIGNAL] = { 0 };
 /* Enum for the properties so that they can be quickly
    found and looked up. */
 enum {
-	PROP_0,
-	PROP_ID,
-	PROP_CATEGORY,
-	PROP_STATUS,
-	PROP_ICON_NAME,
-	PROP_ICON_DESC,
-	PROP_ATTENTION_ICON_NAME,
-	PROP_ATTENTION_ICON_DESC,
-	PROP_ICON_THEME_PATH,
-	PROP_CONNECTED,
-	PROP_LABEL,
-	PROP_LABEL_GUIDE,
-	PROP_ORDERING_INDEX,
-	PROP_DBUS_MENU_SERVER,
-	PROP_TITLE
+    PROP_0,
+    PROP_ID,
+    PROP_CATEGORY,
+    PROP_STATUS,
+    PROP_ICON_NAME,
+    PROP_ICON_DESC,
+    PROP_ATTENTION_ICON_NAME,
+    PROP_ATTENTION_ICON_DESC,
+    PROP_ICON_THEME_PATH,
+    PROP_CONNECTED,
+    PROP_LABEL,
+    PROP_LABEL_GUIDE,
+    PROP_ORDERING_INDEX,
+    PROP_DBUS_MENU_SERVER,
+    PROP_TITLE
 };
 
 /* The strings so that they can be slowly looked up. */
@@ -203,9 +205,9 @@ static void bus_method_call (GDBusConnection * connection, const gchar * sender,
 static void bus_creation (GObject * obj, GAsyncResult * res, gpointer user_data);
 
 static const GDBusInterfaceVTable item_interface_table = {
-	method_call:    bus_method_call,
-	get_property:   bus_get_prop,
-	set_property:   NULL /* No properties that can be set */
+    method_call:    bus_method_call,
+    get_property:   bus_get_prop,
+    set_property:   NULL /* No properties that can be set */
 };
 
 /* GObject type */
@@ -216,23 +218,23 @@ watcher_ready_cb (GObject      *source_object,
                   GAsyncResult *res,
                   gpointer      user_data)
 {
-	AppIndicator *self = APP_INDICATOR(user_data);
-	AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
+    AppIndicator *self = APP_INDICATOR(user_data);
+    AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
 
-	GError *error = NULL;
+    GError *error = NULL;
 
-	priv->watcher_proxy = g_dbus_proxy_new_finish (res, &error);
+    priv->watcher_proxy = g_dbus_proxy_new_finish (res, &error);
 
-	if (error) {
-		start_fallback_timer (self, FALSE);
-		g_object_unref (self);
+    if (error) {
+        start_fallback_timer (self, FALSE);
+        g_object_unref (self);
 
-		g_error_free (error);
-		return;
-	}
+        g_error_free (error);
+        return;
+    }
 
-	check_connect (self);
-	g_object_unref (self);
+    check_connect (self);
+    g_object_unref (self);
 }
 
 static void
@@ -241,19 +243,19 @@ name_appeared_handler (GDBusConnection *connection,
                        const gchar     *name_owner,
                        gpointer         user_data)
 {
-	AppIndicator *self = APP_INDICATOR(user_data);
-	AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
+    AppIndicator *self = APP_INDICATOR(user_data);
+    AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
 
-	g_dbus_proxy_new (priv->connection,
-	                  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
-	                  G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
-	                  watcher_interface_info,
-	                  NOTIFICATION_WATCHER_DBUS_ADDR,
-	                  NOTIFICATION_WATCHER_DBUS_OBJ,
-	                  NOTIFICATION_WATCHER_DBUS_IFACE,
-	                  NULL,
-	                  (GAsyncReadyCallback) watcher_ready_cb,
-	                  (AppIndicator*)g_object_ref (self));
+    g_dbus_proxy_new (priv->connection,
+                      G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
+                      G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+                      watcher_interface_info,
+                      NOTIFICATION_WATCHER_DBUS_ADDR,
+                      NOTIFICATION_WATCHER_DBUS_OBJ,
+                      NOTIFICATION_WATCHER_DBUS_IFACE,
+                      NULL,
+                      (GAsyncReadyCallback) watcher_ready_cb,
+                      (AppIndicator*)g_object_ref (self));
 }
 
 static void
@@ -261,43 +263,43 @@ name_vanished_handler (GDBusConnection *connection,
                        const gchar     *name,
                        gpointer         user_data)
 {
-	AppIndicator *self = APP_INDICATOR(user_data);
-	AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
+    AppIndicator *self = APP_INDICATOR(user_data);
+    AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
 
-	g_clear_object (&priv->watcher_proxy);
+    g_clear_object (&priv->watcher_proxy);
 
-	/* Emit the AppIndicator::connection-changed signal*/
-	g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE);
+    /* Emit the AppIndicator::connection-changed signal*/
+    g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE);
 
-	start_fallback_timer (self, FALSE);
+    start_fallback_timer (self, FALSE);
 }
 
 static void
 app_indicator_class_init (AppIndicatorClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	/* Clean up */
-	object_class->dispose = app_indicator_dispose;
-	object_class->finalize = app_indicator_finalize;
+    /* Clean up */
+    object_class->dispose = app_indicator_dispose;
+    object_class->finalize = app_indicator_finalize;
 
-	/* Property funcs */
-	object_class->set_property = app_indicator_set_property;
-	object_class->get_property = app_indicator_get_property;
+    /* Property funcs */
+    object_class->set_property = app_indicator_set_property;
+    object_class->get_property = app_indicator_get_property;
 
-	/* Our own funcs */
-	klass->fallback = fallback;
-	klass->unfallback = unfallback;
+    /* Our own funcs */
+    klass->fallback = fallback;
+    klass->unfallback = unfallback;
 
-	/* Properties */
+    /* Properties */
 
-	/**
-	 * AppIndicator:id:
-	 *
-	 * The ID for this indicator, which should be unique, but used consistently
-	 * by this program and its indicator.
-	 */
-	g_object_class_install_property (object_class,
+    /**
+     * AppIndicator:id:
+     *
+     * The ID for this indicator, which should be unique, but used consistently
+     * by this program and its indicator.
+     */
+    g_object_class_install_property (object_class,
                                          PROP_ID,
                                          g_param_spec_string(PROP_ID_S,
                                                              "The ID for this indicator",
@@ -305,13 +307,13 @@ app_indicator_class_init (AppIndicatorClass *klass)
                                                              NULL,
                                                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
 
-	/**
-	 * AppIndicator:category:
-	 *
-	 * The type of indicator that this represents.  Please don't use 'Other'. 
-	 * Defaults to 'ApplicationStatus'.
-	 */
-	g_object_class_install_property (object_class,
+    /**
+     * AppIndicator:category:
+     *
+     * The type of indicator that this represents.  Please don't use 'Other'.
+     * Defaults to 'ApplicationStatus'.
+     */
+    g_object_class_install_property (object_class,
                                          PROP_CATEGORY,
                                          g_param_spec_string (PROP_CATEGORY_S,
                                                               "Indicator Category",
@@ -319,13 +321,13 @@ app_indicator_class_init (AppIndicatorClass *klass)
                                                               NULL,
                                                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
 
-	/**
-	 * AppIndicator:status:
-	 *
-	 * Whether the indicator is shown or requests attention. Defaults to
-	 * 'Passive'.
-	 */
-	g_object_class_install_property (object_class,
+    /**
+     * AppIndicator:status:
+     *
+     * Whether the indicator is shown or requests attention. Defaults to
+     * 'Passive'.
+     */
+    g_object_class_install_property (object_class,
                                          PROP_STATUS,
                                          g_param_spec_string (PROP_STATUS_S,
                                                               "Indicator Status",
@@ -333,366 +335,367 @@ app_indicator_class_init (AppIndicatorClass *klass)
                                                               NULL,
                                                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-	/**
-	 * AppIndicator:icon-name:
-	 *
-	 * The name of the regular icon that is shown for the indicator.
-	 */
-	g_object_class_install_property(object_class,
-	                                PROP_ICON_NAME,
-	                                g_param_spec_string (PROP_ICON_NAME_S,
-	                                                     "An icon for the indicator",
-	                                                     "The default icon that is shown for the indicator.",
-	                                                     NULL,
-	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-	/**
-	 * AppIndicator:icon-desc:
-	 *
-	 * The description of the regular icon that is shown for the indicator.
-	 */
-	g_object_class_install_property(object_class,
-	                                PROP_ICON_DESC,
-	                                g_param_spec_string (PROP_ICON_DESC_S,
-	                                                     "A description of the icon for the indicator",
-	                                                     "A description of the default icon that is shown for the indicator.",
-	                                                     NULL,
-	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-	/**
-	 * AppIndicator:attention-icon-name:
-	 *
-	 * If the indicator sets it's status to %APP_INDICATOR_STATUS_ATTENTION
-	 * then this icon is shown.
-	 */
-	g_object_class_install_property (object_class,
+    /**
+     * AppIndicator:icon-name:
+     *
+     * The name of the regular icon that is shown for the indicator.
+     */
+    g_object_class_install_property(object_class,
+                                    PROP_ICON_NAME,
+                                    g_param_spec_string (PROP_ICON_NAME_S,
+                                                         "An icon for the indicator",
+                                                         "The default icon that is shown for the indicator.",
+                                                         NULL,
+                                                         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    /**
+     * AppIndicator:icon-desc:
+     *
+     * The description of the regular icon that is shown for the indicator.
+     */
+    g_object_class_install_property(object_class,
+                                    PROP_ICON_DESC,
+                                    g_param_spec_string (PROP_ICON_DESC_S,
+                                                         "A description of the icon for the indicator",
+                                                         "A description of the default icon that is shown for the indicator.",
+                                                         NULL,
+                                                         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    /**
+     * AppIndicator:attention-icon-name:
+     *
+     * If the indicator sets it's status to %APP_INDICATOR_STATUS_ATTENTION
+     * then this icon is shown.
+     */
+    g_object_class_install_property (object_class,
                                          PROP_ATTENTION_ICON_NAME,
                                          g_param_spec_string (PROP_ATTENTION_ICON_NAME_S,
                                                               "An icon to show when the indicator request attention.",
                                                               "If the indicator sets it's status to 'attention' then this icon is shown.",
                                                               NULL,
                                                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-	/**
-	 * AppIndicator:attention-icon-desc:
-	 *
-	 * If the indicator sets it's status to %APP_INDICATOR_STATUS_ATTENTION
-	 * then this textual description of the icon shown.
-	 */
-	g_object_class_install_property (object_class,
-	                                 PROP_ATTENTION_ICON_DESC,
-	                                 g_param_spec_string (PROP_ATTENTION_ICON_DESC_S,
-	                                                      "A description of the icon to show when the indicator request attention.",
-	                                                      "When the indicator is an attention mode this should describe the icon shown",
-	                                                      NULL,
-	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-	/**
-	 * AppIndicator:icon-theme-path:
-	 *
-	 * An additional place to look for icon names that may be installed by the
-	 * application.
-	 */
-	g_object_class_install_property(object_class,
-	                                PROP_ICON_THEME_PATH,
-	                                g_param_spec_string (PROP_ICON_THEME_PATH_S,
+    /**
+     * AppIndicator:attention-icon-desc:
+     *
+     * If the indicator sets it's status to %APP_INDICATOR_STATUS_ATTENTION
+     * then this textual description of the icon shown.
+     */
+    g_object_class_install_property (object_class,
+                                     PROP_ATTENTION_ICON_DESC,
+                                     g_param_spec_string (PROP_ATTENTION_ICON_DESC_S,
+                                                          "A description of the icon to show when the indicator request attention.",
+                                                          "When the indicator is an attention mode this should describe the icon shown",
+                                                          NULL,
+                                                          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    /**
+     * AppIndicator:icon-theme-path:
+     *
+     * An additional place to look for icon names that may be installed by the
+     * application.
+     */
+    g_object_class_install_property(object_class,
+                                    PROP_ICON_THEME_PATH,
+                                    g_param_spec_string (PROP_ICON_THEME_PATH_S,
                                                              "An additional path for custom icons.",
                                                              "An additional place to look for icon names that may be installed by the application.",
                                                              NULL,
                                                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT));
 
-	/**
-	 * AppIndicator:connected:
-	 * 
-	 * Pretty simple, %TRUE if we have a reasonable expectation of being 
-	 * displayed through this object. You should hide your TrayIcon if so.
-	 */
-	g_object_class_install_property (object_class,
+    /**
+     * AppIndicator:connected:
+     *
+     * Pretty simple, %TRUE if we have a reasonable expectation of being
+     * displayed through this object. You should hide your TrayIcon if so.
+     */
+    g_object_class_install_property (object_class,
                                          PROP_CONNECTED,
                                          g_param_spec_boolean (PROP_CONNECTED_S,
                                                                "Whether we're conneced to a watcher",
                                                                "Pretty simple, true if we have a reasonable expectation of being displayed through this object.  You should hide your TrayIcon if so.",
                                                                FALSE,
                                                                G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-	/**
-	 * AppIndicator:label:
-	 *
-	 * A label that can be shown next to the string in the application
-	 * indicator.  The label will not be shown unless there is an icon
-	 * as well.  The label is useful for numerical and other frequently
-	 * updated information.  In general, it shouldn't be shown unless a
-	 * user requests it as it can take up a significant amount of space
-	 * on the user's panel.  This may not be shown in all visualizations.
-	 */
-	g_object_class_install_property(object_class,
-	                                PROP_LABEL,
-	                                g_param_spec_string (PROP_LABEL_S,
-	                                                     "A label next to the icon",
-	                                                     "A label to provide dynamic information.",
-	                                                     NULL,
-	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-	/**
-	 * AppIndicator:label-guide:
-	 *
-	 * An optional string to provide guidance to the panel on how big
-	 * the #AppIndicator:label string could get.  If this is set correctly
-	 * then the panel should never 'jiggle' as the string adjusts through
-	 * out the range of options.  For instance, if you were providing a
-	 * percentage like "54% thrust" in #AppIndicator:label you'd want to
-	 * set this string to "100% thrust" to ensure space when Scotty can
-	 * get you enough power.
-	 */
-	g_object_class_install_property(object_class,
-	                                PROP_LABEL_GUIDE,
-	                                g_param_spec_string (PROP_LABEL_GUIDE_S,
-	                                                     "A string to size the space available for the label.",
-	                                                     "To ensure that the label does not cause the panel to 'jiggle' this string should provide information on how much space it could take.",
-	                                                     NULL,
-	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-	/**
-	 * AppIndicator:ordering-index:
-	 *
-	 * The ordering index is an odd parameter, and if you think you don't need
-	 * it you're probably right.  In general, the application indicator try
-	 * to place the applications in a recreatable place taking into account
-	 * which category they're in to try and group them.  But, there are some
-	 * cases where you'd want to ensure indicators are next to each other.
-	 * To do that you can override the generated ordering index and replace it
-	 * with a new one.  Again, you probably don't want to be doing this, but
-	 * in case you do, this is the way.
-	 */
-	g_object_class_install_property(object_class,
-	                                PROP_ORDERING_INDEX,
-	                                g_param_spec_uint (PROP_ORDERING_INDEX_S,
-	                                                   "The location that this app indicator should be in the list.",
-	                                                   "A way to override the default ordering of the applications by providing a very specific idea of where this entry should be placed.",
-	                                                   0, G_MAXUINT32, 0,
-	                                                   G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-	/**
-	 * AppIndicator:dbus-menu-server:
-	 *
-	 * A way to get the internal dbusmenu server if it is available.
-	 * This should only be used for testing.
-	 */
-	g_object_class_install_property(object_class,
-	                                PROP_DBUS_MENU_SERVER,
-	                                g_param_spec_object (PROP_DBUS_MENU_SERVER_S,
-	                                                     "The internal DBusmenu Server",
-	                                                     "DBusmenu server which is available for testing the application indicators.",
-	                                                     DBUSMENU_TYPE_SERVER,
-	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-	/**
-	 * AppIndicator:title:
-	 *
-	 * Provides a way to refer to this application indicator in a human
-	 * readable form.  This is used in the Unity desktop in the HUD as
-	 * the first part of the menu entries to distinguish them from the
-	 * focused application's entries.
-	 */
-	g_object_class_install_property(object_class,
-	                                PROP_TITLE,
-	                                g_param_spec_string (PROP_TITLE_S,
-	                                                     "Title of the application indicator",
-	                                                     "A human readable way to refer to this application indicator in the UI.",
-	                                                     NULL,
-	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-	/* Signals */
-
-	/**
-	 * AppIndicator::new-icon:
-	 * @arg0: The #AppIndicator object
-	 *
-	 * when #AppIndicator:icon-name is changed
-	 */
-	signals[NEW_ICON] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ICON,
-	                                  G_TYPE_FROM_CLASS(klass),
-	                                  G_SIGNAL_RUN_LAST,
-	                                  G_STRUCT_OFFSET (AppIndicatorClass, new_icon),
-	                                  NULL, NULL,
-	                                  g_cclosure_marshal_VOID__VOID,
-	                                  G_TYPE_NONE, 0);
-
-	/**
-	 * AppIndicator::new-attention-icon:
-	 * @arg0: The #AppIndicator object
-	 *
-	 * Emitted when #AppIndicator:attention-icon-name is changed
-	 */
-	signals[NEW_ATTENTION_ICON] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON,
-	                                            G_TYPE_FROM_CLASS(klass),
-	                                            G_SIGNAL_RUN_LAST,
-	                                            G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon),
-	                                            NULL, NULL,
-	                                            g_cclosure_marshal_VOID__VOID,
-	                                            G_TYPE_NONE, 0);
-
-	/**
-	 * AppIndicator::new-status:
-	 * @arg0: The #AppIndicator object
-	 * @arg1: The string value of the #AppIndicatorStatus enum.
-	 *
-	 * Emitted when #AppIndicator:status is changed
-	 */
-	signals[NEW_STATUS] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_STATUS,
-	                                    G_TYPE_FROM_CLASS(klass),
-	                                    G_SIGNAL_RUN_LAST,
-	                                    G_STRUCT_OFFSET (AppIndicatorClass, new_status),
-	                                    NULL, NULL,
-	                                    g_cclosure_marshal_VOID__STRING,
-	                                    G_TYPE_NONE, 1,
+    /**
+     * AppIndicator:label:
+     *
+     * A label that can be shown next to the string in the application
+     * indicator.  The label will not be shown unless there is an icon
+     * as well.  The label is useful for numerical and other frequently
+     * updated information.  In general, it shouldn't be shown unless a
+     * user requests it as it can take up a significant amount of space
+     * on the user's panel.  This may not be shown in all visualizations.
+     */
+    g_object_class_install_property(object_class,
+                                    PROP_LABEL,
+                                    g_param_spec_string (PROP_LABEL_S,
+                                                         "A label next to the icon",
+                                                         "A label to provide dynamic information.",
+                                                         NULL,
+                                                         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    /**
+     * AppIndicator:label-guide:
+     *
+     * An optional string to provide guidance to the panel on how big
+     * the #AppIndicator:label string could get.  If this is set correctly
+     * then the panel should never 'jiggle' as the string adjusts through
+     * out the range of options.  For instance, if you were providing a
+     * percentage like "54% thrust" in #AppIndicator:label you'd want to
+     * set this string to "100% thrust" to ensure space when Scotty can
+     * get you enough power.
+     */
+    g_object_class_install_property(object_class,
+                                    PROP_LABEL_GUIDE,
+                                    g_param_spec_string (PROP_LABEL_GUIDE_S,
+                                                         "A string to size the space available for the label.",
+                                                         "To ensure that the label does not cause the panel to 'jiggle' this string should provide information on how much space it could take.",
+                                                         NULL,
+                                                         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    /**
+     * AppIndicator:ordering-index:
+     *
+     * The ordering index is an odd parameter, and if you think you don't need
+     * it you're probably right.  In general, the application indicator try
+     * to place the applications in a recreatable place taking into account
+     * which category they're in to try and group them.  But, there are some
+     * cases where you'd want to ensure indicators are next to each other.
+     * To do that you can override the generated ordering index and replace it
+     * with a new one.  Again, you probably don't want to be doing this, but
+     * in case you do, this is the way.
+     */
+    g_object_class_install_property(object_class,
+                                    PROP_ORDERING_INDEX,
+                                    g_param_spec_uint (PROP_ORDERING_INDEX_S,
+                                                       "The location that this app indicator should be in the list.",
+                                                       "A way to override the default ordering of the applications by providing a very specific idea of where this entry should be placed.",
+                                                       0, G_MAXUINT32, 0,
+                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    /**
+     * AppIndicator:dbus-menu-server:
+     *
+     * A way to get the internal dbusmenu server if it is available.
+     * This should only be used for testing.
+     */
+    g_object_class_install_property(object_class,
+                                    PROP_DBUS_MENU_SERVER,
+                                    g_param_spec_object (PROP_DBUS_MENU_SERVER_S,
+                                                         "The internal DBusmenu Server",
+                                                         "DBusmenu server which is available for testing the application indicators.",
+                                                         DBUSMENU_TYPE_SERVER,
+                                                         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    /**
+     * AppIndicator:title:
+     *
+     * Provides a way to refer to this application indicator in a human
+     * readable form.  This is used in the Unity desktop in the HUD as
+     * the first part of the menu entries to distinguish them from the
+     * focused application's entries.
+     */
+    g_object_class_install_property(object_class,
+                                    PROP_TITLE,
+                                    g_param_spec_string (PROP_TITLE_S,
+                                                         "Title of the application indicator",
+                                                         "A human readable way to refer to this application indicator in the UI.",
+                                                         NULL,
+                                                         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    /* Signals */
+
+    /**
+     * AppIndicator::new-icon:
+     * @arg0: The #AppIndicator object
+     *
+     * when #AppIndicator:icon-name is changed
+     */
+    signals[NEW_ICON] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ICON,
+                                      G_TYPE_FROM_CLASS(klass),
+                                      G_SIGNAL_RUN_LAST,
+                                      G_STRUCT_OFFSET (AppIndicatorClass, new_icon),
+                                      NULL, NULL,
+                                      g_cclosure_marshal_VOID__VOID,
+                                      G_TYPE_NONE, 0);
+
+    /**
+     * AppIndicator::new-attention-icon:
+     * @arg0: The #AppIndicator object
+     *
+     * Emitted when #AppIndicator:attention-icon-name is changed
+     */
+    signals[NEW_ATTENTION_ICON] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON,
+                                                G_TYPE_FROM_CLASS(klass),
+                                                G_SIGNAL_RUN_LAST,
+                                                G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon),
+                                                NULL, NULL,
+                                                g_cclosure_marshal_VOID__VOID,
+                                                G_TYPE_NONE, 0);
+
+    /**
+     * AppIndicator::new-status:
+     * @arg0: The #AppIndicator object
+     * @arg1: The string value of the #AppIndicatorStatus enum.
+     *
+     * Emitted when #AppIndicator:status is changed
+     */
+    signals[NEW_STATUS] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_STATUS,
+                                        G_TYPE_FROM_CLASS(klass),
+                                        G_SIGNAL_RUN_LAST,
+                                        G_STRUCT_OFFSET (AppIndicatorClass, new_status),
+                                        NULL, NULL,
+                                        g_cclosure_marshal_VOID__STRING,
+                                        G_TYPE_NONE, 1,
                                             G_TYPE_STRING);
 
-	/**
-	 * AppIndicator::new-label:
-	 * @arg0: The #AppIndicator object
-	 * @arg1: The string for the label
-	 * @arg2: The string for the guide
-	 *
-	 * Emitted when either #AppIndicator:label or #AppIndicator:label-guide are
-	 * changed.
-	*/
-	signals[NEW_LABEL] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_LABEL,
-	                                    G_TYPE_FROM_CLASS(klass),
-	                                    G_SIGNAL_RUN_LAST,
-	                                    G_STRUCT_OFFSET (AppIndicatorClass, new_label),
-	                                    NULL, NULL,
-	                                    _application_service_marshal_VOID__STRING_STRING,
-	                                    G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
-
-	/**
-	 * AppIndicator::connection-changed:
-	 * @arg0: The #AppIndicator object
-	 * @arg1: Whether we're connected or not
-	 *
-	 * Signaled when we connect to a watcher, or when it drops away.
-	 */
-	signals[CONNECTION_CHANGED] = g_signal_new (APP_INDICATOR_SIGNAL_CONNECTION_CHANGED,
-	                                            G_TYPE_FROM_CLASS(klass),
-	                                            G_SIGNAL_RUN_LAST,
-	                                            G_STRUCT_OFFSET (AppIndicatorClass, connection_changed),
-	                                            NULL, NULL,
-	                                            g_cclosure_marshal_VOID__BOOLEAN,
-	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-
-	/**
-	 * AppIndicator::new-icon-theme-path:
-	 * @arg0: The #AppIndicator object
-	 *
-	 * Signaled when there is a new icon set for the
-	 * object.
-	 */
-	signals[NEW_ICON_THEME_PATH] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH,
-	                                  G_TYPE_FROM_CLASS(klass),
-	                                  G_SIGNAL_RUN_LAST,
-	                                  G_STRUCT_OFFSET (AppIndicatorClass, new_icon_theme_path),
-	                                  NULL, NULL,
-	                                  g_cclosure_marshal_VOID__STRING,
-	                                  G_TYPE_NONE, 1, G_TYPE_STRING);
-
-	/**
-	 * AppIndicator::scroll-event:
-	 * @arg0: The #AppIndicator object
-	 * @arg1: How many steps the scroll wheel has taken
-	 * @arg2: (type Gdk.ScrollDirection): Which direction the wheel went in
-	 *
-	 * Signaled when the #AppIndicator receives a scroll event.
-	 */
-	signals[SCROLL_EVENT] = g_signal_new (APP_INDICATOR_SIGNAL_SCROLL_EVENT,
-	                                  G_TYPE_FROM_CLASS(klass),
-	                                  G_SIGNAL_RUN_LAST,
-	                                  G_STRUCT_OFFSET (AppIndicatorClass, scroll_event),
-	                                  NULL, NULL,
-	                                  _application_service_marshal_VOID__INT_UINT,
-	                                  G_TYPE_NONE, 2, G_TYPE_INT, GDK_TYPE_SCROLL_DIRECTION);
-
-	/* DBus interfaces */
-	if (item_node_info == NULL) {
-		GError * error = NULL;
-
-		item_node_info = g_dbus_node_info_new_for_xml(_notification_item, &error);
-		if (error != NULL) {
-			g_error("Unable to parse Notification Item DBus interface: %s", error->message);
-			g_error_free(error);
-		}
-	}
-
-	if (item_interface_info == NULL && item_node_info != NULL) {
-		item_interface_info = g_dbus_node_info_lookup_interface(item_node_info, NOTIFICATION_ITEM_DBUS_IFACE);
-
-		if (item_interface_info == NULL) {
-			g_error("Unable to find interface '" NOTIFICATION_ITEM_DBUS_IFACE "'");
-		}
-	}
-
-	if (watcher_node_info == NULL) {
-		GError * error = NULL;
-
-		watcher_node_info = g_dbus_node_info_new_for_xml(_notification_watcher, &error);
-		if (error != NULL) {
-			g_error("Unable to parse Notification Item DBus interface: %s", error->message);
-			g_error_free(error);
-		}
-	}
-
-	if (watcher_interface_info == NULL && watcher_node_info != NULL) {
-		watcher_interface_info = g_dbus_node_info_lookup_interface(watcher_node_info, NOTIFICATION_WATCHER_DBUS_IFACE);
-
-		if (watcher_interface_info == NULL) {
-			g_error("Unable to find interface '" NOTIFICATION_WATCHER_DBUS_IFACE "'");
-		}
-	}
-
-	return;
+    /**
+     * AppIndicator::new-label:
+     * @arg0: The #AppIndicator object
+     * @arg1: The string for the label
+     * @arg2: The string for the guide
+     *
+     * Emitted when either #AppIndicator:label or #AppIndicator:label-guide are
+     * changed.
+    */
+    signals[NEW_LABEL] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_LABEL,
+                                        G_TYPE_FROM_CLASS(klass),
+                                        G_SIGNAL_RUN_LAST,
+                                        G_STRUCT_OFFSET (AppIndicatorClass, new_label),
+                                        NULL, NULL,
+                                        _application_service_marshal_VOID__STRING_STRING,
+                                        G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
+
+    /**
+     * AppIndicator::connection-changed:
+     * @arg0: The #AppIndicator object
+     * @arg1: Whether we're connected or not
+     *
+     * Signaled when we connect to a watcher, or when it drops away.
+     */
+    signals[CONNECTION_CHANGED] = g_signal_new (APP_INDICATOR_SIGNAL_CONNECTION_CHANGED,
+                                                G_TYPE_FROM_CLASS(klass),
+                                                G_SIGNAL_RUN_LAST,
+                                                G_STRUCT_OFFSET (AppIndicatorClass, connection_changed),
+                                                NULL, NULL,
+                                                g_cclosure_marshal_VOID__BOOLEAN,
+                                                G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+    /**
+     * AppIndicator::new-icon-theme-path:
+     * @arg0: The #AppIndicator object
+     * @arg1: The icon theme path
+     *
+     * Signaled when there is a new icon set for the
+     * object.
+     */
+    signals[NEW_ICON_THEME_PATH] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH,
+                                      G_TYPE_FROM_CLASS(klass),
+                                      G_SIGNAL_RUN_LAST,
+                                      G_STRUCT_OFFSET (AppIndicatorClass, new_icon_theme_path),
+                                      NULL, NULL,
+                                      g_cclosure_marshal_VOID__STRING,
+                                      G_TYPE_NONE, 1, G_TYPE_STRING);
+
+    /**
+     * AppIndicator::scroll-event:
+     * @arg0: The #AppIndicator object
+     * @arg1: How many steps the scroll wheel has taken
+     * @arg2: (type Gdk.ScrollDirection): Which direction the wheel went in
+     *
+     * Signaled when the #AppIndicator receives a scroll event.
+     */
+    signals[SCROLL_EVENT] = g_signal_new (APP_INDICATOR_SIGNAL_SCROLL_EVENT,
+                                      G_TYPE_FROM_CLASS(klass),
+                                      G_SIGNAL_RUN_LAST,
+                                      G_STRUCT_OFFSET (AppIndicatorClass, scroll_event),
+                                      NULL, NULL,
+                                      _application_service_marshal_VOID__INT_UINT,
+                                      G_TYPE_NONE, 2, G_TYPE_INT, GDK_TYPE_SCROLL_DIRECTION);
+
+    /* DBus interfaces */
+    if (item_node_info == NULL) {
+        GError * error = NULL;
+
+        item_node_info = g_dbus_node_info_new_for_xml(_notification_item, &error);
+        if (error != NULL) {
+            g_error("Unable to parse Notification Item DBus interface: %s", error->message);
+            g_error_free(error);
+        }
+    }
+
+    if (item_interface_info == NULL && item_node_info != NULL) {
+        item_interface_info = g_dbus_node_info_lookup_interface(item_node_info, NOTIFICATION_ITEM_DBUS_IFACE);
+
+        if (item_interface_info == NULL) {
+            g_error("Unable to find interface '" NOTIFICATION_ITEM_DBUS_IFACE "'");
+        }
+    }
+
+    if (watcher_node_info == NULL) {
+        GError * error = NULL;
+
+        watcher_node_info = g_dbus_node_info_new_for_xml(_notification_watcher, &error);
+        if (error != NULL) {
+            g_error("Unable to parse Notification Item DBus interface: %s", error->message);
+            g_error_free(error);
+        }
+    }
+
+    if (watcher_interface_info == NULL && watcher_node_info != NULL) {
+        watcher_interface_info = g_dbus_node_info_lookup_interface(watcher_node_info, NOTIFICATION_WATCHER_DBUS_IFACE);
+
+        if (watcher_interface_info == NULL) {
+            g_error("Unable to find interface '" NOTIFICATION_WATCHER_DBUS_IFACE "'");
+        }
+    }
+
+    return;
 }
 
 static void
 app_indicator_init (AppIndicator *self)
 {
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	priv->id = NULL;
-	priv->clean_id = NULL;
-	priv->category = APP_INDICATOR_CATEGORY_OTHER;
-	priv->status = APP_INDICATOR_STATUS_PASSIVE;
-	priv->icon_name = NULL;
-	priv->attention_icon_name = NULL;
-	priv->icon_theme_path = NULL;
-	priv->absolute_icon_theme_path = get_real_theme_path (self);
-	priv->menu = NULL;
-	priv->menuservice = NULL;
-	priv->ordering_index = 0;
-	priv->title = NULL;
-	priv->label = NULL;
-	priv->label_guide = NULL;
-	priv->label_change_idle = 0;
+    priv->id = NULL;
+    priv->clean_id = NULL;
+    priv->category = APP_INDICATOR_CATEGORY_OTHER;
+    priv->status = APP_INDICATOR_STATUS_PASSIVE;
+    priv->icon_name = NULL;
+    priv->attention_icon_name = NULL;
+    priv->icon_theme_path = NULL;
+    priv->absolute_icon_theme_path = get_real_theme_path (self);
+    priv->menu = NULL;
+    priv->menuservice = NULL;
+    priv->ordering_index = 0;
+    priv->title = NULL;
+    priv->label = NULL;
+    priv->label_guide = NULL;
+    priv->label_change_idle = 0;
 
-	priv->connection = NULL;
-	priv->dbus_registration = 0;
-	priv->path = NULL;
+    priv->connection = NULL;
+    priv->dbus_registration = 0;
+    priv->path = NULL;
 
-	priv->status_icon = NULL;
-	priv->fallback_timer = 0;
+    priv->status_icon = NULL;
+    priv->fallback_timer = 0;
 
-	priv->shorties = NULL;
+    priv->shorties = NULL;
 
-	priv->sec_activate_target = NULL;
-	priv->sec_activate_enabled = FALSE;
+    priv->sec_activate_target = NULL;
+    priv->sec_activate_enabled = FALSE;
 
-	priv->watcher_proxy = NULL;
-	priv->watcher_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-	                                     NOTIFICATION_WATCHER_DBUS_ADDR,
-	                                     G_BUS_NAME_WATCHER_FLAGS_NONE,
-	                                     (GBusNameAppearedCallback) name_appeared_handler,
-	                                     (GBusNameVanishedCallback) name_vanished_handler,
-	                                     self, NULL);
+    priv->watcher_proxy = NULL;
+    priv->watcher_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
+                                         NOTIFICATION_WATCHER_DBUS_ADDR,
+                                         G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                         (GBusNameAppearedCallback) name_appeared_handler,
+                                         (GBusNameVanishedCallback) name_vanished_handler,
+                                         self, NULL);
 
-	/* Start getting the session bus */
-	g_object_ref(self); /* ref for the bus creation callback */
-	g_bus_get(G_BUS_TYPE_SESSION, NULL, bus_creation, self);
+    /* Start getting the session bus */
+    g_object_ref(self); /* ref for the bus creation callback */
+    g_bus_get(G_BUS_TYPE_SESSION, NULL, bus_creation, self);
 
-	g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()),
-		"changed", G_CALLBACK(theme_changed_cb), self);
+    g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()),
+        "changed", G_CALLBACK(theme_changed_cb), self);
 
-	return;
+    return;
 }
 
 /* Free all objects, make sure that all the dbus
@@ -700,78 +703,78 @@ app_indicator_init (AppIndicator *self)
 static void
 app_indicator_dispose (GObject *object)
 {
-	AppIndicator *self = APP_INDICATOR (object);
-	AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
-
-	if (priv->shorties != NULL) {
-		g_object_unref(G_OBJECT(priv->shorties));
-		priv->shorties = NULL;
-	}
-
-	if (priv->status != APP_INDICATOR_STATUS_PASSIVE) {
-		app_indicator_set_status(self, APP_INDICATOR_STATUS_PASSIVE);
-	}
-
-	if (priv->status_icon != NULL) {
-		AppIndicatorClass * class = APP_INDICATOR_GET_CLASS(object);
-		if (class->unfallback != NULL) {
-			class->unfallback(self, priv->status_icon);
-		}
-		priv->status_icon = NULL;
-	}
-
-	if (priv->fallback_timer != 0) {
-		g_source_remove(priv->fallback_timer);
-		priv->fallback_timer = 0;
-	}
-
-	if (priv->label_change_idle != 0) {
-		g_source_remove(priv->label_change_idle);
-		priv->label_change_idle = 0;
-	}
-
-	if (priv->menu != NULL) {
-		g_object_unref(G_OBJECT(priv->menu));
-		priv->menu = NULL;
-	}
-
-	if (priv->menuservice != NULL) {
-		g_object_unref (priv->menuservice);
-	}
-
-	if (priv->watcher_id != 0) {
-		g_bus_unwatch_name (priv->watcher_id);
-		priv->watcher_id = 0;
-	}
-
-	if (priv->watcher_proxy != NULL) {
-		g_object_unref(G_OBJECT(priv->watcher_proxy));
-		priv->watcher_proxy = NULL;
-
-	    /* Emit the AppIndicator::connection-changed signal*/
+    AppIndicator *self = APP_INDICATOR (object);
+    AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
+
+    if (priv->shorties != NULL) {
+        g_object_unref(G_OBJECT(priv->shorties));
+        priv->shorties = NULL;
+    }
+
+    if (priv->status != APP_INDICATOR_STATUS_PASSIVE) {
+        app_indicator_set_status(self, APP_INDICATOR_STATUS_PASSIVE);
+    }
+
+    if (priv->status_icon != NULL) {
+        AppIndicatorClass * class = APP_INDICATOR_GET_CLASS(object);
+        if (class->unfallback != NULL) {
+            class->unfallback(self, priv->status_icon);
+        }
+        priv->status_icon = NULL;
+    }
+
+    if (priv->fallback_timer != 0) {
+        g_source_remove(priv->fallback_timer);
+        priv->fallback_timer = 0;
+    }
+
+    if (priv->label_change_idle != 0) {
+        g_source_remove(priv->label_change_idle);
+        priv->label_change_idle = 0;
+    }
+
+    if (priv->menu != NULL) {
+        g_object_unref(G_OBJECT(priv->menu));
+        priv->menu = NULL;
+    }
+
+    if (priv->menuservice != NULL) {
+        g_object_unref (priv->menuservice);
+    }
+
+    if (priv->watcher_id != 0) {
+        g_bus_unwatch_name (priv->watcher_id);
+        priv->watcher_id = 0;
+    }
+
+    if (priv->watcher_proxy != NULL) {
+        g_object_unref(G_OBJECT(priv->watcher_proxy));
+        priv->watcher_proxy = NULL;
+
+        /* Emit the AppIndicator::connection-changed signal*/
         g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE);
-	}
+    }
 
-	if (priv->dbus_registration != 0) {
-		g_dbus_connection_unregister_object(priv->connection, priv->dbus_registration);
-		priv->dbus_registration = 0;
-	}
+    if (priv->dbus_registration != 0) {
+        g_dbus_connection_unregister_object(priv->connection, priv->dbus_registration);
+        priv->dbus_registration = 0;
+    }
 
-	if (priv->connection != NULL) {
-		g_object_unref(G_OBJECT(priv->connection));
-		priv->connection = NULL;
-	}
+    if (priv->connection != NULL) {
+        g_object_unref(G_OBJECT(priv->connection));
+        priv->connection = NULL;
+    }
 
-	if (priv->sec_activate_target != NULL) {
-		g_signal_handlers_disconnect_by_func (priv->sec_activate_target, sec_activate_target_parent_changed, self);
-		g_object_unref(G_OBJECT(priv->sec_activate_target));
-		priv->sec_activate_target = NULL;
-	}
+    if (priv->sec_activate_target != NULL) {
+        g_signal_handlers_disconnect_by_func (priv->sec_activate_target, sec_activate_target_parent_changed, self);
+        g_object_unref(G_OBJECT(priv->sec_activate_target));
+        priv->sec_activate_target = NULL;
+    }
 
-	g_signal_handlers_disconnect_by_func(gtk_icon_theme_get_default(), G_CALLBACK(theme_changed_cb), self);
+    g_signal_handlers_disconnect_by_func(gtk_icon_theme_get_default(), G_CALLBACK(theme_changed_cb), self);
 
-	G_OBJECT_CLASS (app_indicator_parent_class)->dispose (object);
-	return;
+    G_OBJECT_CLASS (app_indicator_parent_class)->dispose (object);
+    return;
 }
 
 /* Free all of the memory that we could be using in
@@ -779,85 +782,85 @@ app_indicator_dispose (GObject *object)
 static void
 app_indicator_finalize (GObject *object)
 {
-	AppIndicator * self = APP_INDICATOR(object);
-	AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
-
-	if (priv->status != APP_INDICATOR_STATUS_PASSIVE) {
-		g_warning("Finalizing Application Status with the status set to: %d", priv->status);
-	}
-
-	if (priv->id != NULL) {
-		g_free(priv->id);
-		priv->id = NULL;
-	}
-
-	if (priv->clean_id != NULL) {
-		g_free(priv->clean_id);
-		priv->clean_id = NULL;
-	}
-
-	if (priv->icon_name != NULL) {
-		g_free(priv->icon_name);
-		priv->icon_name = NULL;
-	}
-
-	if (priv->absolute_icon_name != NULL) {
-		g_free(priv->absolute_icon_name);
-		priv->absolute_icon_name = NULL;
-	}
-
-	if (priv->attention_icon_name != NULL) {
-		g_free(priv->attention_icon_name);
-		priv->attention_icon_name = NULL;
-	}
-
-	if (priv->absolute_attention_icon_name != NULL) {
-		g_free(priv->absolute_attention_icon_name);
-		priv->absolute_attention_icon_name = NULL;
-	}
-
-	if (priv->icon_theme_path != NULL) {
-		g_free(priv->icon_theme_path);
-		priv->icon_theme_path = NULL;
-	}
-
-	if (priv->absolute_icon_theme_path != NULL) {
-		g_free(priv->absolute_icon_theme_path);
-		priv->absolute_icon_theme_path = NULL;
-	}
-
-	if (priv->title != NULL) {
-		g_free(priv->title);
-		priv->title = NULL;
-	}
-
-	if (priv->label != NULL) {
-		g_free(priv->label);
-		priv->label = NULL;
-	}
-
-	if (priv->label_guide != NULL) {
-		g_free(priv->label_guide);
-		priv->label_guide = NULL;
-	}
-
-	if (priv->accessible_desc != NULL) {
-		g_free(priv->accessible_desc);
-		priv->accessible_desc = NULL;
-	}
-
-	if (priv->att_accessible_desc != NULL) {
-		g_free(priv->att_accessible_desc);
-		priv->att_accessible_desc = NULL;
-	}
-
-	if (priv->path != NULL) {
-		g_free(priv->path);
-		priv->path = NULL;
-	}
-
-	G_OBJECT_CLASS (app_indicator_parent_class)->finalize (object);
-	return;
+    AppIndicator * self = APP_INDICATOR(object);
+    AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
+
+    if (priv->status != APP_INDICATOR_STATUS_PASSIVE) {
+        g_warning("Finalizing Application Status with the status set to: %d", priv->status);
+    }
+
+    if (priv->id != NULL) {
+        g_free(priv->id);
+        priv->id = NULL;
+    }
+
+    if (priv->clean_id != NULL) {
+        g_free(priv->clean_id);
+        priv->clean_id = NULL;
+    }
+
+    if (priv->icon_name != NULL) {
+        g_free(priv->icon_name);
+        priv->icon_name = NULL;
+    }
+
+    if (priv->absolute_icon_name != NULL) {
+        g_free(priv->absolute_icon_name);
+        priv->absolute_icon_name = NULL;
+    }
+
+    if (priv->attention_icon_name != NULL) {
+        g_free(priv->attention_icon_name);
+        priv->attention_icon_name = NULL;
+    }
+
+    if (priv->absolute_attention_icon_name != NULL) {
+        g_free(priv->absolute_attention_icon_name);
+        priv->absolute_attention_icon_name = NULL;
+    }
+
+    if (priv->icon_theme_path != NULL) {
+        g_free(priv->icon_theme_path);
+        priv->icon_theme_path = NULL;
+    }
+
+    if (priv->absolute_icon_theme_path != NULL) {
+        g_free(priv->absolute_icon_theme_path);
+        priv->absolute_icon_theme_path = NULL;
+    }
+
+    if (priv->title != NULL) {
+        g_free(priv->title);
+        priv->title = NULL;
+    }
+
+    if (priv->label != NULL) {
+        g_free(priv->label);
+        priv->label = NULL;
+    }
+
+    if (priv->label_guide != NULL) {
+        g_free(priv->label_guide);
+        priv->label_guide = NULL;
+    }
+
+    if (priv->accessible_desc != NULL) {
+        g_free(priv->accessible_desc);
+        priv->accessible_desc = NULL;
+    }
+
+    if (priv->att_accessible_desc != NULL) {
+        g_free(priv->att_accessible_desc);
+        priv->att_accessible_desc = NULL;
+    }
+
+    if (priv->path != NULL) {
+        g_free(priv->path);
+        priv->path = NULL;
+    }
+
+    G_OBJECT_CLASS (app_indicator_parent_class)->finalize (object);
+    return;
 }
 
 #define WARN_BAD_TYPE(prop, value)  g_warning("Can not work with property '%s' with value of type '%s'.", prop, G_VALUE_TYPE_NAME(value))
@@ -941,97 +944,99 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu
           check_connect (self);
           break;
 
-		case PROP_LABEL: {
-		  gchar * oldlabel = priv->label;
-		  priv->label = g_value_dup_string(value);
-
-		  if (priv->label != NULL && priv->label[0] == '\0') {
-		  	g_free(priv->label);
-			priv->label = NULL;
-		  }
-
-		  if (g_strcmp0(oldlabel, priv->label) != 0) {
-		    signal_label_change(APP_INDICATOR(object));
-		  }
-
-		  if (oldlabel != NULL) {
-		  	g_free(oldlabel);
-		  }
-		  break;
-		}
-		case PROP_TITLE: {
-		  gchar * oldtitle = priv->title;
-		  priv->title = g_value_dup_string(value);
-
-		  if (priv->title != NULL && priv->title[0] == '\0') {
-		  	g_free(priv->title);
-			priv->title = NULL;
-		  }
-
-		  if (g_strcmp0(oldtitle, priv->title) != 0 && priv->connection != NULL) {
-			GError * error = NULL;
-
-			g_dbus_connection_emit_signal(priv->connection,
-										  NULL,
-										  priv->path,
-										  NOTIFICATION_ITEM_DBUS_IFACE,
-										  "NewTitle",
-										  NULL,
-										  &error);
-
-			if (error != NULL) {
-				g_warning("Unable to send signal for NewTitle: %s", error->message);
-				g_error_free(error);
-			}
-		  }
-
-		  if (oldtitle != NULL) {
-		  	g_free(oldtitle);
-		  }
-
-		  if (priv->status_icon != NULL) {
-		  	gtk_status_icon_set_title(priv->status_icon, priv->title ? priv->title : "");
-		  }
-		  break;
-		}
-		case PROP_LABEL_GUIDE: {
-		  gchar * oldguide = priv->label_guide;
-		  priv->label_guide = g_value_dup_string(value);
-
-		  if (priv->label_guide != NULL && priv->label_guide[0] == '\0') {
-		    g_free(priv->label_guide);
-		    priv->label_guide = NULL;
-		  }
-
-		  if (g_strcmp0(oldguide, priv->label_guide) != 0) {
-		    signal_label_change(APP_INDICATOR(object));
-		  }
-
-		  if (priv->label_guide != NULL && priv->label_guide[0] == '\0') {
-		  	g_free(priv->label_guide);
-			priv->label_guide = NULL;
-		  }
-
-		  if (oldguide != NULL) {
-		  	g_free(oldguide);
-		  }
-		  break;
-		}
-		case PROP_ORDERING_INDEX:
-		  priv->ordering_index = g_value_get_uint(value);
-		  break;
-
-		case PROP_DBUS_MENU_SERVER:
-			g_clear_object (&priv->menuservice);
-			priv->menuservice = DBUSMENU_SERVER (g_value_dup_object(value));
-			break;
+        case PROP_LABEL: {
+          gchar * oldlabel = priv->label;
+          priv->label = g_value_dup_string(value);
+
+          if (priv->label != NULL && priv->label[0] == '\0') {
+            g_free(priv->label);
+            priv->label = NULL;
+          }
+
+          if (g_strcmp0(oldlabel, priv->label) != 0) {
+            signal_label_change(APP_INDICATOR(object));
+          }
+
+          if (oldlabel != NULL) {
+            g_free(oldlabel);
+          }
+          break;
+        }
+        case PROP_TITLE: {
+          gchar * oldtitle = priv->title;
+          priv->title = g_value_dup_string(value);
+
+          if (priv->title != NULL && priv->title[0] == '\0') {
+            g_free(priv->title);
+            priv->title = NULL;
+          }
+
+          if (g_strcmp0(oldtitle, priv->title) != 0 && priv->connection != NULL) {
+            GError * error = NULL;
+
+            g_dbus_connection_emit_signal(priv->connection,
+                                          NULL,
+                                          priv->path,
+                                          NOTIFICATION_ITEM_DBUS_IFACE,
+                                          "NewTitle",
+                                          NULL,
+                                          &error);
+
+            if (error != NULL) {
+                g_warning("Unable to send signal for NewTitle: %s", error->message);
+                g_error_free(error);
+            }
+          }
+
+          if (oldtitle != NULL) {
+            g_free(oldtitle);
+          }
+
+          if (priv->status_icon != NULL) {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+            gtk_status_icon_set_title(priv->status_icon, priv->title ? priv->title : "");
+G_GNUC_END_IGNORE_DEPRECATIONS
+          }
+          break;
+        }
+        case PROP_LABEL_GUIDE: {
+          gchar * oldguide = priv->label_guide;
+          priv->label_guide = g_value_dup_string(value);
+
+          if (priv->label_guide != NULL && priv->label_guide[0] == '\0') {
+            g_free(priv->label_guide);
+            priv->label_guide = NULL;
+          }
+
+          if (g_strcmp0(oldguide, priv->label_guide) != 0) {
+            signal_label_change(APP_INDICATOR(object));
+          }
+
+          if (priv->label_guide != NULL && priv->label_guide[0] == '\0') {
+            g_free(priv->label_guide);
+            priv->label_guide = NULL;
+          }
+
+          if (oldguide != NULL) {
+            g_free(oldguide);
+          }
+          break;
+        }
+        case PROP_ORDERING_INDEX:
+          priv->ordering_index = g_value_get_uint(value);
+          break;
+
+        case PROP_DBUS_MENU_SERVER:
+            g_clear_object (&priv->menuservice);
+            priv->menuservice = DBUSMENU_SERVER (g_value_dup_object(value));
+            break;
 
         default:
           G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
           break;
         }
 
-	return;
+    return;
 }
 
 /* Function to fill our value with the property it's requesting. */
@@ -1077,20 +1082,20 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa
           g_value_set_string (value, priv->icon_theme_path);
           break;
 
-		case PROP_CONNECTED: {
-			gboolean connected = FALSE;
+        case PROP_CONNECTED: {
+            gboolean connected = FALSE;
 
-			if (priv->watcher_proxy != NULL) {
-				gchar * name = g_dbus_proxy_get_name_owner(priv->watcher_proxy);
-				if (name != NULL) {
-					connected = TRUE;
-					g_free(name);
-				}
-			}
+            if (priv->watcher_proxy != NULL) {
+                gchar * name = g_dbus_proxy_get_name_owner(priv->watcher_proxy);
+                if (name != NULL) {
+                    connected = TRUE;
+                    g_free(name);
+                }
+            }
 
-			g_value_set_boolean (value, connected);
-			break;
-		}
+            g_value_set_boolean (value, connected);
+            break;
+        }
 
         case PROP_LABEL:
           g_value_set_string (value, priv->label);
@@ -1100,24 +1105,24 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa
           g_value_set_string (value, priv->label_guide);
           break;
 
-		case PROP_ORDERING_INDEX:
-		  g_value_set_uint(value, priv->ordering_index);
-		  break;
+        case PROP_ORDERING_INDEX:
+          g_value_set_uint(value, priv->ordering_index);
+          break;
 
-		case PROP_DBUS_MENU_SERVER:
-			g_value_set_object(value, priv->menuservice);
-			break;
+        case PROP_DBUS_MENU_SERVER:
+            g_value_set_object(value, priv->menuservice);
+            break;
 
-		case PROP_TITLE:
-			g_value_set_string(value, priv->title);
-			break;
+        case PROP_TITLE:
+            g_value_set_string(value, priv->title);
+            break;
 
         default:
           G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
           break;
         }
 
-	return;
+    return;
 }
 
 /* DBus bus has been created, well maybe, but we got a call
@@ -1125,27 +1130,27 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa
 static void
 bus_creation (GObject * obj, GAsyncResult * res, gpointer user_data)
 {
-	GError * error = NULL;
+    GError * error = NULL;
 
-	GDBusConnection * connection = g_bus_get_finish(res, &error);
-	if (error != NULL) {
-		g_warning("Unable to get the session bus: %s", error->message);
-		g_error_free(error);
-		g_object_unref(G_OBJECT(user_data));
-		return;
-	}
+    GDBusConnection * connection = g_bus_get_finish(res, &error);
+    if (error != NULL) {
+        g_warning("Unable to get the session bus: %s", error->message);
+        g_error_free(error);
+        g_object_unref(G_OBJECT(user_data));
+        return;
+    }
 
-	AppIndicator * app = APP_INDICATOR(user_data);
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(app);
-	priv->connection = connection;
+    AppIndicator * app = APP_INDICATOR(user_data);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(app);
+    priv->connection = connection;
 
-	/* If the connection was blocking the exporting of the
-	   object this function will export everything. */
-	check_connect(app);
+    /* If the connection was blocking the exporting of the
+       object this function will export everything. */
+    check_connect(app);
 
-	g_object_unref(G_OBJECT(app));
+    g_object_unref(G_OBJECT(app));
 
-	return;
+    return;
 }
 
 static void
@@ -1154,46 +1159,46 @@ bus_method_call (GDBusConnection * connection, const gchar * sender,
                  const gchar * method, GVariant * params,
                  GDBusMethodInvocation * invocation, gpointer user_data)
 {
-	g_return_if_fail(IS_APP_INDICATOR(user_data));
+    g_return_if_fail(APP_IS_INDICATOR(user_data));
 
-	AppIndicator * app = APP_INDICATOR(user_data);
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(app);
-	GVariant * retval = NULL;
+    AppIndicator * app = APP_INDICATOR(user_data);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(app);
+    GVariant * retval = NULL;
 
-	if (g_strcmp0(method, "Scroll") == 0) {
-		GdkScrollDirection direction;
-		gint delta;
-		const gchar *orientation;
+    if (g_strcmp0(method, "Scroll") == 0) {
+        GdkScrollDirection direction;
+        gint delta;
+        const gchar *orientation;
 
-		g_variant_get(params, "(i&s)", &delta, &orientation);
+        g_variant_get(params, "(i&s)", &delta, &orientation);
+
+        if (g_strcmp0(orientation, "horizontal") == 0) {
+            direction = (delta >= 0) ? GDK_SCROLL_RIGHT : GDK_SCROLL_LEFT;
+        } else if (g_strcmp0(orientation, "vertical") == 0) {
+            direction = (delta >= 0) ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
+        } else {
+            g_dbus_method_invocation_return_value(invocation, retval);
+            return;
+        }
 
-		if (g_strcmp0(orientation, "horizontal") == 0) {
-			direction = (delta >= 0) ? GDK_SCROLL_RIGHT : GDK_SCROLL_LEFT;
-		} else if (g_strcmp0(orientation, "vertical") == 0) {
-			direction = (delta >= 0) ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
-		} else {
-			g_dbus_method_invocation_return_value(invocation, retval);
-			return;
-		}
+        delta = ABS(delta);
+        g_signal_emit(app, signals[SCROLL_EVENT], 0, delta, direction);
 
-		delta = ABS(delta);
-		g_signal_emit(app, signals[SCROLL_EVENT], 0, delta, direction);
+    } else if (g_strcmp0(method, "SecondaryActivate") == 0 ||
+               g_strcmp0(method, "XAyatanaSecondaryActivate") == 0) {
+        GtkWidget *menuitem = priv->sec_activate_target;
 
-	} else if (g_strcmp0(method, "SecondaryActivate") == 0 ||
-	           g_strcmp0(method, "XAyatanaSecondaryActivate") == 0) {
-		GtkWidget *menuitem = priv->sec_activate_target;
-		
-		if (priv->sec_activate_enabled && menuitem &&
-		    gtk_widget_get_visible (menuitem) &&
-		    gtk_widget_get_sensitive (menuitem))
-		{
-			gtk_widget_activate (menuitem);
-		}
-	} else {
-		g_warning("Calling method '%s' on the app-indicator and it's unknown", method);
-	}
+        if (priv->sec_activate_enabled && menuitem &&
+            gtk_widget_get_visible (menuitem) &&
+            gtk_widget_get_sensitive (menuitem))
+        {
+            gtk_widget_activate (menuitem);
+        }
+    } else {
+        g_warning("Calling method '%s' on the app-indicator and it's unknown", method);
+    }
 
-	g_dbus_method_invocation_return_value(invocation, retval);
+    g_dbus_method_invocation_return_value(invocation, retval);
 }
 
 /* DBus is asking for a property so we should figure out what it
@@ -1201,107 +1206,107 @@ bus_method_call (GDBusConnection * connection, const gchar * sender,
 static GVariant *
 bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * property, GError ** error, gpointer user_data)
 {
-	g_return_val_if_fail(IS_APP_INDICATOR(user_data), NULL);
-	AppIndicator * app = APP_INDICATOR(user_data);
-	AppIndicatorPrivate *priv = app_indicator_get_instance_private(app);
+    g_return_val_if_fail(APP_IS_INDICATOR(user_data), NULL);
+    AppIndicator * app = APP_INDICATOR(user_data);
+    AppIndicatorPrivate *priv = app_indicator_get_instance_private(app);
 
-	if (g_strcmp0(property, "Id") == 0) {
-		return g_variant_new_string(priv->id ? priv->id : "");
-	} else if (g_strcmp0(property, "Category") == 0) {
+    if (g_strcmp0(property, "Id") == 0) {
+        return g_variant_new_string(priv->id ? priv->id : "");
+    } else if (g_strcmp0(property, "Category") == 0) {
         GEnumValue *enum_value;
-		enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_CATEGORY), priv->category);
-		return g_variant_new_string(enum_value->value_nick ? enum_value->value_nick : "");
-	} else if (g_strcmp0(property, "Status") == 0) {
+        enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_CATEGORY), priv->category);
+        return g_variant_new_string(enum_value->value_nick ? enum_value->value_nick : "");
+    } else if (g_strcmp0(property, "Status") == 0) {
         GEnumValue *enum_value;
-		enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), priv->status);
-		return g_variant_new_string(enum_value->value_nick ? enum_value->value_nick : "");
-	} else if (g_strcmp0(property, "IconName") == 0) {
-		if (priv->absolute_icon_name) {
-			return g_variant_new_string(priv->absolute_icon_name);
-		}
-		return g_variant_new_string(priv->icon_name ? priv->icon_name : "");
-	} else if (g_strcmp0(property, "AttentionIconName") == 0) {
-		if (priv->absolute_attention_icon_name) {
-			return g_variant_new_string(priv->absolute_attention_icon_name);
-		}
-		return g_variant_new_string(priv->attention_icon_name ? priv->attention_icon_name : "");
-	} else if (g_strcmp0(property, "Title") == 0) {
-		const gchar * output = NULL;
-		if (priv->title == NULL) {
-			const gchar * name = g_get_application_name();
-			if (name != NULL) {
-				output = name;
-			} else {
-				output = "";
-			}
-		} else {
-			output = priv->title;
-		}
-		return g_variant_new_string(output);
-	} else if (g_strcmp0(property, "IconThemePath") == 0) {
-		if (priv->absolute_icon_theme_path) {
-			return g_variant_new_string(priv->absolute_icon_theme_path);
-		}
-		return g_variant_new_string(priv->icon_theme_path ? priv->icon_theme_path : "");
-	} else if (g_strcmp0(property, "Menu") == 0) {
-		if (priv->menuservice != NULL) {
-			GValue strval = { 0 };
-			g_value_init(&strval, G_TYPE_STRING);
-			g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strval);
-			GVariant * var = g_variant_new("o", g_value_get_string(&strval));
-			g_value_unset(&strval);
-			return var;
-		} else {
-			return g_variant_new("o", "/");
-		}
-	} else if (g_strcmp0(property, "XAyatanaLabel") == 0) {
-		return g_variant_new_string(priv->label ? priv->label : "");
-	} else if (g_strcmp0(property, "XAyatanaLabelGuide") == 0) {
-		return g_variant_new_string(priv->label_guide ? priv->label_guide : "");
-	} else if (g_strcmp0(property, "XAyatanaOrderingIndex") == 0) {
-		return g_variant_new_uint32(priv->ordering_index);
-	} else if (g_strcmp0(property, "IconAccessibleDesc") == 0) {
-		return g_variant_new_string(priv->accessible_desc ? priv->accessible_desc : "");
-	} else if (g_strcmp0(property, "AttentionAccessibleDesc") == 0) {
-		return g_variant_new_string(priv->att_accessible_desc ? priv->att_accessible_desc : "");
-	}
-
-	*error = g_error_new(0, 0, "Unknown property: %s", property);
-	return NULL;
+        enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), priv->status);
+        return g_variant_new_string(enum_value->value_nick ? enum_value->value_nick : "");
+    } else if (g_strcmp0(property, "IconName") == 0) {
+        if (priv->absolute_icon_name) {
+            return g_variant_new_string(priv->absolute_icon_name);
+        }
+        return g_variant_new_string(priv->icon_name ? priv->icon_name : "");
+    } else if (g_strcmp0(property, "AttentionIconName") == 0) {
+        if (priv->absolute_attention_icon_name) {
+            return g_variant_new_string(priv->absolute_attention_icon_name);
+        }
+        return g_variant_new_string(priv->attention_icon_name ? priv->attention_icon_name : "");
+    } else if (g_strcmp0(property, "Title") == 0) {
+        const gchar * output = NULL;
+        if (priv->title == NULL) {
+            const gchar * name = g_get_application_name();
+            if (name != NULL) {
+                output = name;
+            } else {
+                output = "";
+            }
+        } else {
+            output = priv->title;
+        }
+        return g_variant_new_string(output);
+    } else if (g_strcmp0(property, "IconThemePath") == 0) {
+        if (priv->absolute_icon_theme_path) {
+            return g_variant_new_string(priv->absolute_icon_theme_path);
+        }
+        return g_variant_new_string(priv->icon_theme_path ? priv->icon_theme_path : "");
+    } else if (g_strcmp0(property, "Menu") == 0) {
+        if (priv->menuservice != NULL) {
+            GValue strval = { 0 };
+            g_value_init(&strval, G_TYPE_STRING);
+            g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strval);
+            GVariant * var = g_variant_new("o", g_value_get_string(&strval));
+            g_value_unset(&strval);
+            return var;
+        } else {
+            return g_variant_new("o", "/");
+        }
+    } else if (g_strcmp0(property, "XAyatanaLabel") == 0) {
+        return g_variant_new_string(priv->label ? priv->label : "");
+    } else if (g_strcmp0(property, "XAyatanaLabelGuide") == 0) {
+        return g_variant_new_string(priv->label_guide ? priv->label_guide : "");
+    } else if (g_strcmp0(property, "XAyatanaOrderingIndex") == 0) {
+        return g_variant_new_uint32(priv->ordering_index);
+    } else if (g_strcmp0(property, "IconAccessibleDesc") == 0) {
+        return g_variant_new_string(priv->accessible_desc ? priv->accessible_desc : "");
+    } else if (g_strcmp0(property, "AttentionAccessibleDesc") == 0) {
+        return g_variant_new_string(priv->att_accessible_desc ? priv->att_accessible_desc : "");
+    }
+
+    *error = g_error_new(0, 0, "Unknown property: %s", property);
+    return NULL;
 }
 
 /* Sends the label changed signal and resets the source ID */
 static gboolean
 signal_label_change_idle (gpointer user_data)
 {
-	AppIndicator * self = (AppIndicator *)user_data;
-	AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
+    AppIndicator * self = (AppIndicator *)user_data;
+    AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
 
-	gchar * label = priv->label != NULL ? priv->label : "";
-	gchar * guide = priv->label_guide != NULL ? priv->label_guide : "";
+    gchar * label = priv->label != NULL ? priv->label : "";
+    gchar * guide = priv->label_guide != NULL ? priv->label_guide : "";
 
-	g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0,
-	              label, guide);
-	if (priv->dbus_registration != 0 && priv->connection != NULL) {
-		GError * error = NULL;
+    g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0,
+                  label, guide);
+    if (priv->dbus_registration != 0 && priv->connection != NULL) {
+        GError * error = NULL;
 
-		g_dbus_connection_emit_signal(priv->connection,
-		                              NULL,
-		                              priv->path,
-		                              NOTIFICATION_ITEM_DBUS_IFACE,
-		                              "XAyatanaNewLabel",
-		                              g_variant_new("(ss)", label, guide),
-		                              &error);
+        g_dbus_connection_emit_signal(priv->connection,
+                                      NULL,
+                                      priv->path,
+                                      NOTIFICATION_ITEM_DBUS_IFACE,
+                                      "XAyatanaNewLabel",
+                                      g_variant_new("(ss)", label, guide),
+                                      &error);
 
-		if (error != NULL) {
-			g_warning("Unable to send signal for NewIcon: %s", error->message);
-			g_error_free(error);
-		}
-	}
+        if (error != NULL) {
+            g_warning("Unable to send signal for NewIcon: %s", error->message);
+            g_error_free(error);
+        }
+    }
 
-	priv->label_change_idle = 0;
+    priv->label_change_idle = 0;
 
-	return FALSE;
+    return FALSE;
 }
 
 /* Sets up an idle function to send the label changed signal
@@ -1309,15 +1314,15 @@ signal_label_change_idle (gpointer user_data)
 static void
 signal_label_change (AppIndicator * self)
 {
-	AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
+    AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
 
-	/* don't set it twice */
-	if (priv->label_change_idle != 0) {
-		return;
-	}
+    /* don't set it twice */
+    if (priv->label_change_idle != 0) {
+        return;
+    }
 
-	priv->label_change_idle = g_idle_add(signal_label_change_idle, self);
-	return;
+    priv->label_change_idle = g_idle_add(signal_label_change_idle, self);
+    return;
 }
 
 /* This function is used to see if we have enough information to
@@ -1326,62 +1331,62 @@ signal_label_change (AppIndicator * self)
 static void
 check_connect (AppIndicator *self)
 {
-	AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
-
-	/* Do we have a connection? */
-	if (priv->connection == NULL) return;
-
-	/* If we already have a proxy, let's see if it has someone
-	   implementing it.  If not, we can't do much more than to
-	   do nothing. */
-	if (priv->watcher_proxy != NULL) {
-		gchar * name = g_dbus_proxy_get_name_owner(priv->watcher_proxy);
-		if (name == NULL) {
-			return;
-		}
-		g_free(name);
-	}
-
-	/* Do we have enough information? */
-	if (priv->menu == NULL) return;
-	if (priv->icon_name == NULL) return;
-	if (priv->id == NULL) return;
-
-	if (priv->path == NULL) {
-		priv->path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->clean_id);
-	}
-
-	if (priv->dbus_registration == 0) {
-		GError * error = NULL;
-		priv->dbus_registration = g_dbus_connection_register_object(priv->connection,
-		                                                            priv->path,
-		                                                            item_interface_info,
-		                                                            &item_interface_table,
-		                                                            self,
-		                                                            NULL,
-		                                                            &error);
-		if (error != NULL) {
-			g_warning("Unable to register object on path '%s': %s", priv->path, error->message);
-			g_error_free(error);
-			return;
-		}
-	}
-
-	/* NOTE: It's really important the order here.  We make sure to *publish*
-	   the object on the bus and *then* get the proxy.  The reason is that we
-	   want to ensure all the filters are setup before talking to the watcher
-	   and that's where the order is important. */
-
-	if (priv->watcher_proxy == NULL)
-		return;
-
-	g_dbus_proxy_call (priv->watcher_proxy,
-	                   "RegisterStatusNotifierItem",
-	                   g_variant_new ("(s)", priv->path),
-	                   G_DBUS_CALL_FLAGS_NONE,
-	                   -1, NULL,
-	                   (GAsyncReadyCallback) register_service_cb,
-	                   (AppIndicator*)g_object_ref (self));
+    AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
+
+    /* Do we have a connection? */
+    if (priv->connection == NULL) return;
+
+    /* If we already have a proxy, let's see if it has someone
+       implementing it.  If not, we can't do much more than to
+       do nothing. */
+    if (priv->watcher_proxy != NULL) {
+        gchar * name = g_dbus_proxy_get_name_owner(priv->watcher_proxy);
+        if (name == NULL) {
+            return;
+        }
+        g_free(name);
+    }
+
+    /* Do we have enough information? */
+    if (priv->menu == NULL) return;
+    if (priv->icon_name == NULL) return;
+    if (priv->id == NULL) return;
+
+    if (priv->path == NULL) {
+        priv->path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->clean_id);
+    }
+
+    if (priv->dbus_registration == 0) {
+        GError * error = NULL;
+        priv->dbus_registration = g_dbus_connection_register_object(priv->connection,
+                                                                    priv->path,
+                                                                    item_interface_info,
+                                                                    &item_interface_table,
+                                                                    self,
+                                                                    NULL,
+                                                                    &error);
+        if (error != NULL) {
+            g_warning("Unable to register object on path '%s': %s", priv->path, error->message);
+            g_error_free(error);
+            return;
+        }
+    }
+
+    /* NOTE: It's really important the order here.  We make sure to *publish*
+       the object on the bus and *then* get the proxy.  The reason is that we
+       want to ensure all the filters are setup before talking to the watcher
+       and that's where the order is important. */
+
+    if (priv->watcher_proxy == NULL)
+        return;
+
+    g_dbus_proxy_call (priv->watcher_proxy,
+                       "RegisterStatusNotifierItem",
+                       g_variant_new ("(s)", priv->path),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1, NULL,
+                       (GAsyncReadyCallback) register_service_cb,
+                       (AppIndicator*)g_object_ref (self));
 }
 
 /* Responce from the DBus command to register a service
@@ -1389,40 +1394,40 @@ check_connect (AppIndicator *self)
 static void
 register_service_cb (GObject * obj, GAsyncResult * res, gpointer user_data)
 {
-	GError * error = NULL;
-	GVariant * returns = g_dbus_proxy_call_finish(G_DBUS_PROXY(obj), res, &error);
+    GError * error = NULL;
+    GVariant * returns = g_dbus_proxy_call_finish(G_DBUS_PROXY(obj), res, &error);
 
-	/* We don't care about any return values */
-	if (returns != NULL) {
-		g_variant_unref(returns);
-	}
+    /* We don't care about any return values */
+    if (returns != NULL) {
+        g_variant_unref(returns);
+    }
 
-	if (error != NULL) {
-		/* They didn't respond, ewww.  Not sure what they could
-		   be doing */
-		g_warning("Unable to connect to the Notification Watcher: %s", error->message);
-		start_fallback_timer(APP_INDICATOR(user_data), TRUE);
-		g_object_unref(G_OBJECT(user_data));
-		return;
-	}
+    if (error != NULL) {
+        /* They didn't respond, ewww.  Not sure what they could
+           be doing */
+        g_warning("Unable to connect to the Notification Watcher: %s", error->message);
+        start_fallback_timer(APP_INDICATOR(user_data), TRUE);
+        g_object_unref(G_OBJECT(user_data));
+        return;
+    }
 
-	g_return_if_fail(IS_APP_INDICATOR(user_data));
-	AppIndicator * app = APP_INDICATOR(user_data);
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(app);
+    g_return_if_fail(APP_IS_INDICATOR(user_data));
+    AppIndicator * app = APP_INDICATOR(user_data);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(app);
 
-	/* Emit the AppIndicator::connection-changed signal*/
+    /* Emit the AppIndicator::connection-changed signal*/
     g_signal_emit (app, signals[CONNECTION_CHANGED], 0, TRUE);
 
-	if (priv->status_icon) {
-		AppIndicatorClass * class = APP_INDICATOR_GET_CLASS(app);
-		if (class->unfallback != NULL) {
-			class->unfallback(app, priv->status_icon);
-			priv->status_icon = NULL;
-		} 
-	}
+    if (priv->status_icon) {
+        AppIndicatorClass * class = APP_INDICATOR_GET_CLASS(app);
+        if (class->unfallback != NULL) {
+            class->unfallback(app, priv->status_icon);
+            priv->status_icon = NULL;
+        }
+    }
 
-	g_object_unref(G_OBJECT(user_data));
-	return;
+    g_object_unref(G_OBJECT(user_data));
+    return;
 }
 
 /* A helper function to get the nick out of a given
@@ -1443,27 +1448,27 @@ category_from_enum (AppIndicatorCategory category)
 static void
 start_fallback_timer (AppIndicator * self, gboolean disable_timeout)
 {
-	g_return_if_fail(IS_APP_INDICATOR(self));
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    g_return_if_fail(APP_IS_INDICATOR(self));
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	if (priv->fallback_timer != 0) {
-		/* The timer is set, let's just be happy with the one
-		   we've already got running */
-		return;
-	}
+    if (priv->fallback_timer != 0) {
+        /* The timer is set, let's just be happy with the one
+           we've already got running */
+        return;
+    }
 
-	if (priv->status_icon != NULL) {
-		/* We're already fallen back.  Let's not do it again. */
-		return;
-	}
+    if (priv->status_icon != NULL) {
+        /* We're already fallen back.  Let's not do it again. */
+        return;
+    }
 
-	if (disable_timeout) {
-		fallback_timer_expire(self);
-	} else {
-		priv->fallback_timer = g_timeout_add(DEFAULT_FALLBACK_TIMER, fallback_timer_expire, self);
-	}
+    if (disable_timeout) {
+        fallback_timer_expire(self);
+    } else {
+        priv->fallback_timer = g_timeout_add(DEFAULT_FALLBACK_TIMER, fallback_timer_expire, self);
+    }
 
-	return;
+    return;
 }
 
 /* A function that gets executed when we want to change the
@@ -1471,56 +1476,56 @@ start_fallback_timer (AppIndicator * self, gboolean disable_timeout)
 static gboolean
 fallback_timer_expire (gpointer data)
 {
-	g_return_val_if_fail(IS_APP_INDICATOR(data), FALSE);
+    g_return_val_if_fail(APP_IS_INDICATOR(data), FALSE);
 
         AppIndicator * app = APP_INDICATOR(data);
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(app);
-	AppIndicatorClass * class = APP_INDICATOR_GET_CLASS(data);
-
-	if (priv->status_icon == NULL) {
-		if (class->fallback != NULL) {
-			priv->status_icon = class->fallback(APP_INDICATOR(data));
-		} 
-	} else {
-		if (class->unfallback != NULL) {
-			class->unfallback(APP_INDICATOR(data), priv->status_icon);
-			priv->status_icon = NULL;
-		} else {
-			g_warning("No 'unfallback' function but the 'fallback' function returned a non-NULL result.");
-		}
-	}
-
-	priv->fallback_timer = 0;
-	return FALSE;
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(app);
+    AppIndicatorClass * class = APP_INDICATOR_GET_CLASS(data);
+
+    if (priv->status_icon == NULL) {
+        if (class->fallback != NULL) {
+            priv->status_icon = class->fallback(APP_INDICATOR(data));
+        }
+    } else {
+        if (class->unfallback != NULL) {
+            class->unfallback(APP_INDICATOR(data), priv->status_icon);
+            priv->status_icon = NULL;
+        } else {
+            g_warning("No 'unfallback' function but the 'fallback' function returned a non-NULL result.");
+        }
+    }
+
+    priv->fallback_timer = 0;
+    return FALSE;
 }
 
 /* emit a NEW_ICON signal in response for the theme change */
 static void
 theme_changed_cb (GtkIconTheme * theme, gpointer user_data)
 {
-	g_signal_emit (user_data, signals[NEW_ICON], 0);
+    g_signal_emit (user_data, signals[NEW_ICON], 0);
 
-	AppIndicator * self = (AppIndicator *)user_data;
-	AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
+    AppIndicator * self = (AppIndicator *)user_data;
+    AppIndicatorPrivate *priv = app_indicator_get_instance_private(self);
 
-	if (priv->dbus_registration != 0 && priv->connection != NULL) {
-		GError * error = NULL;
+    if (priv->dbus_registration != 0 && priv->connection != NULL) {
+        GError * error = NULL;
 
-		g_dbus_connection_emit_signal(priv->connection,
-		                              NULL,
-		                              priv->path,
-		                              NOTIFICATION_ITEM_DBUS_IFACE,
-		                              "NewIcon",
-		                              NULL,
-		                              &error);
+        g_dbus_connection_emit_signal(priv->connection,
+                                      NULL,
+                                      priv->path,
+                                      NOTIFICATION_ITEM_DBUS_IFACE,
+                                      "NewIcon",
+                                      NULL,
+                                      &error);
 
-		if (error != NULL) {
-			g_warning("Unable to send signal for NewIcon: %s", error->message);
-			g_error_free(error);
-		}
-	}
+        if (error != NULL) {
+            g_warning("Unable to send signal for NewIcon: %s", error->message);
+            g_error_free(error);
+        }
+    }
 
-	return;
+    return;
 }
 
 /* Creates a StatusIcon that can be used when the application
@@ -1528,29 +1533,32 @@ theme_changed_cb (GtkIconTheme * theme, gpointer user_data)
 static GtkStatusIcon *
 fallback (AppIndicator * self)
 {
-	GtkStatusIcon * icon = gtk_status_icon_new();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+    GtkStatusIcon * icon = gtk_status_icon_new();
+    gtk_status_icon_set_name(icon, app_indicator_get_id(self));
+G_GNUC_END_IGNORE_DEPRECATIONS
+    const gchar * title = app_indicator_get_title(self);
+    if (title != NULL) {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+        gtk_status_icon_set_title(icon, title);
+G_GNUC_END_IGNORE_DEPRECATIONS
+    }
 
-	gtk_status_icon_set_name(icon, app_indicator_get_id(self));
-	const gchar * title = app_indicator_get_title(self);
-	if (title != NULL) {
-		gtk_status_icon_set_title(icon, title);
-	}
-	
-	g_signal_connect(G_OBJECT(self), APP_INDICATOR_SIGNAL_NEW_STATUS,
-		G_CALLBACK(status_icon_status_wrapper), icon);
-	g_signal_connect(G_OBJECT(self), APP_INDICATOR_SIGNAL_NEW_ICON,
-		G_CALLBACK(status_icon_changes), icon);
-	g_signal_connect(G_OBJECT(self), APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON,
-		G_CALLBACK(status_icon_changes), icon);
+    g_signal_connect(G_OBJECT(self), APP_INDICATOR_SIGNAL_NEW_STATUS,
+        G_CALLBACK(status_icon_status_wrapper), icon);
+    g_signal_connect(G_OBJECT(self), APP_INDICATOR_SIGNAL_NEW_ICON,
+        G_CALLBACK(status_icon_changes), icon);
+    g_signal_connect(G_OBJECT(self), APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON,
+        G_CALLBACK(status_icon_changes), icon);
 
-	status_icon_changes(self, icon);
+    status_icon_changes(self, icon);
 
-	g_signal_connect(G_OBJECT(icon), "activate", G_CALLBACK(status_icon_activate), self);
-	g_signal_connect(G_OBJECT(icon), "popup-menu", G_CALLBACK(status_icon_menu_activate), self);
-	g_signal_connect(G_OBJECT(icon), "scroll-event", G_CALLBACK(scroll_event_wrapper), self);
-	g_signal_connect(G_OBJECT(icon), "button-release-event", G_CALLBACK(middle_click_wrapper), self);
+    g_signal_connect(G_OBJECT(icon), "activate", G_CALLBACK(status_icon_activate), self);
+    g_signal_connect(G_OBJECT(icon), "popup-menu", G_CALLBACK(status_icon_menu_activate), self);
+    g_signal_connect(G_OBJECT(icon), "scroll-event", G_CALLBACK(scroll_event_wrapper), self);
+    g_signal_connect(G_OBJECT(icon), "button-release-event", G_CALLBACK(middle_click_wrapper), self);
 
-	return icon;
+    return icon;
 }
 
 /* A wrapper as the status update prototype is a little
@@ -1558,7 +1566,7 @@ fallback (AppIndicator * self)
 static void
 status_icon_status_wrapper (AppIndicator * self, const gchar * status, gpointer data)
 {
-	return status_icon_changes(self, data);
+    return status_icon_changes(self, data);
 }
 
 /* A wrapper for redirecting the scroll events to the app-indicator from status
@@ -1566,38 +1574,38 @@ status_icon_status_wrapper (AppIndicator * self, const gchar * status, gpointer
 static gboolean
 scroll_event_wrapper (GtkWidget *status_icon, GdkEventScroll *event, gpointer data)
 {
-	g_return_val_if_fail(IS_APP_INDICATOR(data), FALSE);
-	AppIndicator * app = APP_INDICATOR(data);
-	g_signal_emit(app, signals[SCROLL_EVENT], 0, 1, event->direction);
+    g_return_val_if_fail(APP_IS_INDICATOR(data), FALSE);
+    AppIndicator * app = APP_INDICATOR(data);
+    g_signal_emit(app, signals[SCROLL_EVENT], 0, 1, event->direction);
 
-	return TRUE;
+    return TRUE;
 }
 
 static gboolean
 middle_click_wrapper (GtkWidget *status_icon, GdkEventButton *event, gpointer data)
 {
-	g_return_val_if_fail(IS_APP_INDICATOR(data), FALSE);
-	AppIndicator * app = APP_INDICATOR(data);
-	AppIndicatorPrivate *priv = app_indicator_get_instance_private(app);
-
-	if (event->button == 2 && event->type == GDK_BUTTON_RELEASE) {
-		GtkAllocation alloc;
-		gint px = event->x;
-		gint py = event->y;
-		gtk_widget_get_allocation (status_icon, &alloc);
-		GtkWidget *menuitem = priv->sec_activate_target;
-
-		if (px >= 0 && px < alloc.width && py >= 0 && py < alloc.height &&
-		    priv->sec_activate_enabled && menuitem &&
-		    gtk_widget_get_visible (menuitem) &&
-		    gtk_widget_get_sensitive (menuitem))
-		{
-			gtk_widget_activate (menuitem);
-			return TRUE;
-		}
-	}
+    g_return_val_if_fail(APP_IS_INDICATOR(data), FALSE);
+    AppIndicator * app = APP_INDICATOR(data);
+    AppIndicatorPrivate *priv = app_indicator_get_instance_private(app);
+
+    if (event->button == 2 && event->type == GDK_BUTTON_RELEASE) {
+        GtkAllocation alloc;
+        gint px = event->x;
+        gint py = event->y;
+        gtk_widget_get_allocation (status_icon, &alloc);
+        GtkWidget *menuitem = priv->sec_activate_target;
+
+        if (px >= 0 && px < alloc.width && py >= 0 && py < alloc.height &&
+            priv->sec_activate_enabled && menuitem &&
+            gtk_widget_get_visible (menuitem) &&
+            gtk_widget_get_sensitive (menuitem))
+        {
+            gtk_widget_activate (menuitem);
+            return TRUE;
+        }
+    }
 
-	return FALSE;
+    return FALSE;
 }
 
 /* This tracks changes to either the status or the icons
@@ -1605,75 +1613,89 @@ middle_click_wrapper (GtkWidget *status_icon, GdkEventButton *event, gpointer da
 static void
 status_icon_changes (AppIndicator * self, gpointer data)
 {
-	GtkStatusIcon * icon = GTK_STATUS_ICON(data);
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
-
-	/* add the icon_theme_path once if needed */
-	GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
-	const gchar *theme_path = priv->absolute_icon_theme_path ?
-	                            priv->absolute_icon_theme_path :
-	                            priv->icon_theme_path;
-
-	if (theme_path != NULL) {
-		gchar **path;
-		gint n_elements, i;
-		gboolean found=FALSE;
-		gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements);
-		if (path != NULL) {
-			for (i=0; i< n_elements; i++) {
-				if(g_strcmp0(path[i], theme_path) == 0) {
-					found=TRUE;
-					break;
-				}
-			}
-			g_strfreev (path);
-		}
-		if(!found) {
-			gtk_icon_theme_append_search_path(icon_theme, theme_path);
-		}
-	}
-
-	const gchar * icon_name = NULL;
-	switch (app_indicator_get_status(self)) {
-	case APP_INDICATOR_STATUS_PASSIVE:
-		/* hide first to avoid that the change is visible to the user */
-		gtk_status_icon_set_visible(icon, FALSE);
-		icon_name = app_indicator_get_icon(self);
-		break;
-	case APP_INDICATOR_STATUS_ACTIVE:
-		icon_name = app_indicator_get_icon(self);
-		gtk_status_icon_set_visible(icon, TRUE);
-		break;
-	case APP_INDICATOR_STATUS_ATTENTION:
-		/* get the _attention_ icon here */
-		icon_name = app_indicator_get_attention_icon(self);
-		gtk_status_icon_set_visible(icon, TRUE);
-		break;
-	};
-
-	if (icon_name != NULL) {
-		gchar *snapped_icon = append_snap_prefix(icon_name);
-
-		if (g_file_test(icon_name, G_FILE_TEST_EXISTS)) {
-			gtk_status_icon_set_from_file(icon, icon_name);
-		} else if (snapped_icon && g_file_test(snapped_icon, G_FILE_TEST_EXISTS)) {
-			gtk_status_icon_set_from_file(icon, snapped_icon);
-		} else {
-			gchar *longname = append_panel_icon_suffix(icon_name);
-
-			if (longname != NULL && gtk_icon_theme_has_icon (icon_theme, longname)) {
-				gtk_status_icon_set_from_icon_name(icon, longname);
-			} else {
-				gtk_status_icon_set_from_icon_name(icon, icon_name);
-			}
-
-			g_free(longname);
-		}
-
-		g_free(snapped_icon);
-	}
-
-	return;
+    GtkStatusIcon * icon = GTK_STATUS_ICON(data);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+
+    /* add the icon_theme_path once if needed */
+    GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
+    const gchar *theme_path = priv->absolute_icon_theme_path ?
+                                priv->absolute_icon_theme_path :
+                                priv->icon_theme_path;
+
+    if (theme_path != NULL) {
+        gchar **path;
+        gint n_elements, i;
+        gboolean found=FALSE;
+        gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements);
+        if (path != NULL) {
+            for (i=0; i< n_elements; i++) {
+                if(g_strcmp0(path[i], theme_path) == 0) {
+                    found=TRUE;
+                    break;
+                }
+            }
+            g_strfreev (path);
+        }
+        if(!found) {
+            gtk_icon_theme_append_search_path(icon_theme, theme_path);
+        }
+    }
+
+    const gchar * icon_name = NULL;
+    switch (app_indicator_get_status(self)) {
+    case APP_INDICATOR_STATUS_PASSIVE:
+        /* hide first to avoid that the change is visible to the user */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+        gtk_status_icon_set_visible(icon, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
+        icon_name = app_indicator_get_icon(self);
+        break;
+    case APP_INDICATOR_STATUS_ACTIVE:
+        icon_name = app_indicator_get_icon(self);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+        gtk_status_icon_set_visible(icon, TRUE);
+G_GNUC_END_IGNORE_DEPRECATIONS
+        break;
+    case APP_INDICATOR_STATUS_ATTENTION:
+        /* get the _attention_ icon here */
+        icon_name = app_indicator_get_attention_icon(self);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+        gtk_status_icon_set_visible(icon, TRUE);
+G_GNUC_END_IGNORE_DEPRECATIONS
+        break;
+    };
+
+    if (icon_name != NULL) {
+        gchar *snapped_icon = append_snap_prefix(icon_name);
+
+        if (g_file_test(icon_name, G_FILE_TEST_EXISTS)) {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+            gtk_status_icon_set_from_file(icon, icon_name);
+G_GNUC_END_IGNORE_DEPRECATIONS
+        } else if (snapped_icon && g_file_test(snapped_icon, G_FILE_TEST_EXISTS)) {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+            gtk_status_icon_set_from_file(icon, snapped_icon);
+G_GNUC_END_IGNORE_DEPRECATIONS
+        } else {
+            gchar *longname = append_panel_icon_suffix(icon_name);
+
+            if (longname != NULL && gtk_icon_theme_has_icon (icon_theme, longname)) {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+                gtk_status_icon_set_from_icon_name(icon, longname);
+G_GNUC_END_IGNORE_DEPRECATIONS
+            } else {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+                gtk_status_icon_set_from_icon_name(icon, icon_name);
+G_GNUC_END_IGNORE_DEPRECATIONS
+            }
+
+            g_free(longname);
+        }
+
+        g_free(snapped_icon);
+    }
+
+    return;
 }
 
 /* Handles the activate action by the status icon by showing
@@ -1681,19 +1703,19 @@ status_icon_changes (AppIndicator * self, gpointer data)
 static void
 status_icon_activate (GtkStatusIcon * icon, gpointer data)
 {
-	GtkMenu * menu = app_indicator_get_menu(APP_INDICATOR(data));
-	if (menu == NULL)
-		return;
-
-	gtk_menu_popup(menu,
-	               NULL, /* Parent Menu */
-	               NULL, /* Parent item */
-	               gtk_status_icon_position_menu,
-	               icon,
-	               1, /* Button */
-	               gtk_get_current_event_time());
-
-	return;
+    GtkMenu * menu = app_indicator_get_menu(APP_INDICATOR(data));
+    if (menu == NULL)
+        return;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+    gtk_menu_popup(menu,
+                   NULL, /* Parent Menu */
+                   NULL, /* Parent item */
+                   gtk_status_icon_position_menu,
+                   icon,
+                   1, /* Button */
+                   gtk_get_current_event_time());
+G_GNUC_END_IGNORE_DEPRECATIONS
+    return;
 }
 
 /* Handles the right-click action by the status icon by showing
@@ -1701,7 +1723,7 @@ status_icon_activate (GtkStatusIcon * icon, gpointer data)
 static void
 status_icon_menu_activate (GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data)
 {
-	status_icon_activate(status_icon, user_data);
+    status_icon_activate(status_icon, user_data);
 }
 
 /* Removes the status icon as the application indicator area
@@ -1709,13 +1731,15 @@ status_icon_menu_activate (GtkStatusIcon *status_icon, guint button, guint activ
 static void
 unfallback (AppIndicator * self, GtkStatusIcon * status_icon)
 {
-	g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_status_wrapper, status_icon);
-	g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_changes, status_icon);
-	g_signal_handlers_disconnect_by_func(G_OBJECT(self), scroll_event_wrapper, status_icon);
-	g_signal_handlers_disconnect_by_func(G_OBJECT(self), middle_click_wrapper, status_icon);
-	gtk_status_icon_set_visible(status_icon, FALSE);
-	g_object_unref(G_OBJECT(status_icon));
-	return;
+    g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_status_wrapper, status_icon);
+    g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_changes, status_icon);
+    g_signal_handlers_disconnect_by_func(G_OBJECT(self), scroll_event_wrapper, status_icon);
+    g_signal_handlers_disconnect_by_func(G_OBJECT(self), middle_click_wrapper, status_icon);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+    gtk_status_icon_set_visible(status_icon, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
+    g_object_unref(G_OBJECT(status_icon));
+    return;
 }
 
 /* A helper function that appends PANEL_ICON_SUFFIX to the given icon name
@@ -1723,50 +1747,50 @@ unfallback (AppIndicator * self, GtkStatusIcon * status_icon)
 static gchar *
 append_panel_icon_suffix (const gchar *icon_name)
 {
-	gchar * long_name = NULL;
+    gchar * long_name = NULL;
 
-	if (!g_str_has_suffix (icon_name, PANEL_ICON_SUFFIX)) {
-		long_name =
-		    g_strdup_printf("%s-%s", icon_name, PANEL_ICON_SUFFIX);
+    if (!g_str_has_suffix (icon_name, PANEL_ICON_SUFFIX)) {
+        long_name =
+            g_strdup_printf("%s-%s", icon_name, PANEL_ICON_SUFFIX);
         } else {
-           	long_name = g_strdup (icon_name);
+            long_name = g_strdup (icon_name);
         }
 
-	return long_name;
+    return long_name;
 }
 
 static gboolean
 widget_is_menu_child(AppIndicator * self, GtkWidget *child)
 {
-	g_return_val_if_fail(IS_APP_INDICATOR(self), FALSE);
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    g_return_val_if_fail(APP_IS_INDICATOR(self), FALSE);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	if (!priv->menu) return FALSE;
-	if (!child) return FALSE;
+    if (!priv->menu) return FALSE;
+    if (!child) return FALSE;
 
-	GtkWidget *parent;
+    GtkWidget *parent;
 
-	while ((parent = gtk_widget_get_parent(child))) {
-		if (parent == priv->menu)
-			return TRUE;
+    while ((parent = gtk_widget_get_parent(child))) {
+        if (parent == priv->menu)
+            return TRUE;
 
-		if (GTK_IS_MENU(parent))
-			child = gtk_menu_get_attach_widget(GTK_MENU(parent));
-		else
-			child = parent;
-	}
+        if (GTK_IS_MENU(parent))
+            child = gtk_menu_get_attach_widget(GTK_MENU(parent));
+        else
+            child = parent;
+    }
 
-	return FALSE;
+    return FALSE;
 }
 
 static void
 sec_activate_target_parent_changed(GtkWidget *menuitem, GtkWidget *old_parent,
                                    gpointer data)
 {
-	g_return_if_fail(IS_APP_INDICATOR(data));
-	AppIndicator *self = APP_INDICATOR(data);
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
-	priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
+    g_return_if_fail(APP_IS_INDICATOR(data));
+    AppIndicator *self = APP_INDICATOR(data);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
 }
 
 
@@ -1783,7 +1807,7 @@ sec_activate_target_parent_changed(GtkWidget *menuitem, GtkWidget *old_parent,
  * Creates a new #AppIndicator setting the properties:
  * #AppIndicator:id with @id, #AppIndicator:category with @category
  * and #AppIndicator:icon-name with @icon_name.
- * 
+ *
  * Return value: A pointer to a new #AppIndicator object.
  */
 AppIndicator *
@@ -1820,14 +1844,14 @@ app_indicator_new_with_path (const gchar          *id,
                              AppIndicatorCategory  category,
                              const gchar          *icon_theme_path)
 {
-	AppIndicator *indicator = g_object_new (APP_INDICATOR_TYPE,
-	                                        PROP_ID_S, id,
-	                                        PROP_CATEGORY_S, category_from_enum (category),
-	                                        PROP_ICON_NAME_S, icon_name,
-	                                        PROP_ICON_THEME_PATH_S, icon_theme_path,
-	                                        NULL);
+    AppIndicator *indicator = g_object_new (APP_INDICATOR_TYPE,
+                                            PROP_ID_S, id,
+                                            PROP_CATEGORY_S, category_from_enum (category),
+                                            PROP_ICON_NAME_S, icon_name,
+                                            PROP_ICON_THEME_PATH_S, icon_theme_path,
+                                            NULL);
 
-	return indicator;
+    return indicator;
 }
 
 /**
@@ -1848,34 +1872,34 @@ app_indicator_new_with_path (const gchar          *id,
 void
 app_indicator_set_status (AppIndicator *self, AppIndicatorStatus status)
 {
-	g_return_if_fail (IS_APP_INDICATOR (self));
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    g_return_if_fail (APP_IS_INDICATOR (self));
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	if (priv->status != status) {
-		GEnumValue *value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), status);
+    if (priv->status != status) {
+        GEnumValue *value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), status);
 
-		priv->status = status;
-		g_signal_emit (self, signals[NEW_STATUS], 0, value->value_nick);
+        priv->status = status;
+        g_signal_emit (self, signals[NEW_STATUS], 0, value->value_nick);
 
-		if (priv->dbus_registration != 0 && priv->connection != NULL) {
-			GError * error = NULL;
+        if (priv->dbus_registration != 0 && priv->connection != NULL) {
+            GError * error = NULL;
 
-			g_dbus_connection_emit_signal(priv->connection,
-										  NULL,
-										  priv->path,
-										  NOTIFICATION_ITEM_DBUS_IFACE,
-										  "NewStatus",
-										  g_variant_new("(s)", value->value_nick),
-										  &error);
+            g_dbus_connection_emit_signal(priv->connection,
+                                          NULL,
+                                          priv->path,
+                                          NOTIFICATION_ITEM_DBUS_IFACE,
+                                          "NewStatus",
+                                          g_variant_new("(s)", value->value_nick),
+                                          &error);
 
-			if (error != NULL) {
-				g_warning("Unable to send signal for NewStatus: %s", error->message);
-				g_error_free(error);
-			}
-		}
-	}
+            if (error != NULL) {
+                g_warning("Unable to send signal for NewStatus: %s", error->message);
+                g_error_free(error);
+            }
+        }
+    }
 
-	return;
+    return;
 }
 
 /**
@@ -1891,68 +1915,68 @@ app_indicator_set_status (AppIndicator *self, AppIndicatorStatus status)
 void
 app_indicator_set_attention_icon (AppIndicator *self, const gchar *icon_name)
 {
-	return app_indicator_set_attention_icon_full(self, icon_name, NULL);
+    return app_indicator_set_attention_icon_full(self, icon_name, NULL);
 }
 
 /**
  * app_indicator_set_attention_icon_full:
  * @self: The #AppIndicator object to use
  * @icon_name: The name of the attention icon to set for this indicator
- * @icon_desc: A textual description of the icon
+ * @icon_desc: (nullable): A textual description of the icon
  *
  * Wrapper function for property #AppIndicator:attention-icon-name.
  */
 void
 app_indicator_set_attention_icon_full (AppIndicator *self, const gchar *icon_name, const gchar * icon_desc)
 {
-	g_return_if_fail (IS_APP_INDICATOR (self));
-	g_return_if_fail (icon_name != NULL);
-	gboolean changed = FALSE;
+    g_return_if_fail (APP_IS_INDICATOR (self));
+    g_return_if_fail (icon_name != NULL);
+    gboolean changed = FALSE;
 
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	if (g_strcmp0 (priv->attention_icon_name, icon_name) != 0) {
-		g_free (priv->attention_icon_name);
-		priv->attention_icon_name = g_strdup (icon_name);
+    if (g_strcmp0 (priv->attention_icon_name, icon_name) != 0) {
+        g_free (priv->attention_icon_name);
+        priv->attention_icon_name = g_strdup (icon_name);
 
-		g_free(priv->absolute_attention_icon_name);
-		priv->absolute_attention_icon_name = NULL;
+        g_free(priv->absolute_attention_icon_name);
+        priv->absolute_attention_icon_name = NULL;
 
-		if (icon_name && icon_name[0] == '/') {
-			priv->absolute_attention_icon_name = append_snap_prefix (icon_name);
-		}
+        if (icon_name && icon_name[0] == '/') {
+            priv->absolute_attention_icon_name = append_snap_prefix (icon_name);
+        }
 
-		changed = TRUE;
-	}
+        changed = TRUE;
+    }
 
-	if (g_strcmp0(priv->att_accessible_desc, icon_desc) != 0) {
-		g_free (priv->att_accessible_desc);
-		priv->att_accessible_desc = g_strdup (icon_desc);
-		changed = TRUE;
-	}
+    if (g_strcmp0(priv->att_accessible_desc, icon_desc) != 0) {
+        g_free (priv->att_accessible_desc);
+        priv->att_accessible_desc = g_strdup (icon_desc);
+        changed = TRUE;
+    }
 
-	if (changed) {
-		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0);
+    if (changed) {
+        g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0);
 
-		if (priv->dbus_registration != 0 && priv->connection != NULL) {
-			GError * error = NULL;
+        if (priv->dbus_registration != 0 && priv->connection != NULL) {
+            GError * error = NULL;
 
-			g_dbus_connection_emit_signal(priv->connection,
-			                              NULL,
-			                              priv->path,
-			                              NOTIFICATION_ITEM_DBUS_IFACE,
-			                              "NewAttentionIcon",
-			                              NULL,
-			                              &error);
+            g_dbus_connection_emit_signal(priv->connection,
+                                          NULL,
+                                          priv->path,
+                                          NOTIFICATION_ITEM_DBUS_IFACE,
+                                          "NewAttentionIcon",
+                                          NULL,
+                                          &error);
 
-			if (error != NULL) {
-				g_warning("Unable to send signal for NewAttentionIcon: %s", error->message);
-				g_error_free(error);
-			}
-		}
-	}
+            if (error != NULL) {
+                g_warning("Unable to send signal for NewAttentionIcon: %s", error->message);
+                g_error_free(error);
+            }
+        }
+    }
 
-	return;
+    return;
 }
 
 /**
@@ -1968,14 +1992,14 @@ app_indicator_set_attention_icon_full (AppIndicator *self, const gchar *icon_nam
 void
 app_indicator_set_icon (AppIndicator *self, const gchar *icon_name)
 {
-	return app_indicator_set_icon_full(self, icon_name, NULL);
+    return app_indicator_set_icon_full(self, icon_name, NULL);
 }
 
 /**
  * app_indicator_set_icon_full:
  * @self: The #AppIndicator object to use
  * @icon_name: The icon name to set.
- * @icon_desc: A textual description of the icon for accessibility
+ * @icon_desc: (nullable): A textual description of the icon for accessibility
  *
  * Sets the default icon to use when the status is active but
  * not set to attention.  In most cases, this should be the
@@ -1987,60 +2011,60 @@ app_indicator_set_icon (AppIndicator *self, const gchar *icon_name)
 void
 app_indicator_set_icon_full (AppIndicator *self, const gchar *icon_name, const gchar * icon_desc)
 {
-	g_return_if_fail (IS_APP_INDICATOR (self));
-	g_return_if_fail (icon_name != NULL);
-	gboolean changed = FALSE;
+    g_return_if_fail (APP_IS_INDICATOR (self));
+    g_return_if_fail (icon_name != NULL);
+    gboolean changed = FALSE;
 
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	if (g_strcmp0 (priv->icon_name, icon_name) != 0) {
-		if (priv->icon_name) {
-			g_free (priv->icon_name);
-		}
+    if (g_strcmp0 (priv->icon_name, icon_name) != 0) {
+        if (priv->icon_name) {
+            g_free (priv->icon_name);
+        }
 
-		priv->icon_name = g_strdup(icon_name);
+        priv->icon_name = g_strdup(icon_name);
 
-		g_free(priv->absolute_icon_name);
-		priv->absolute_icon_name = NULL;
+        g_free(priv->absolute_icon_name);
+        priv->absolute_icon_name = NULL;
 
-		if (icon_name && icon_name[0] == '/') {
-			priv->absolute_icon_name = append_snap_prefix (icon_name);
-		}
+        if (icon_name && icon_name[0] == '/') {
+            priv->absolute_icon_name = append_snap_prefix (icon_name);
+        }
 
-		changed = TRUE;
-	}
+        changed = TRUE;
+    }
 
-	if (g_strcmp0(priv->accessible_desc, icon_desc) != 0) {
-		if (priv->accessible_desc != NULL) {
-			g_free(priv->accessible_desc);
-		}
+    if (g_strcmp0(priv->accessible_desc, icon_desc) != 0) {
+        if (priv->accessible_desc != NULL) {
+            g_free(priv->accessible_desc);
+        }
 
-		priv->accessible_desc = g_strdup(icon_desc);
-		changed = TRUE;
-	}
+        priv->accessible_desc = g_strdup(icon_desc);
+        changed = TRUE;
+    }
 
-	if (changed) {
-		g_signal_emit (self, signals[NEW_ICON], 0);
+    if (changed) {
+        g_signal_emit (self, signals[NEW_ICON], 0);
 
-		if (priv->dbus_registration != 0 && priv->connection != NULL) {
-			GError * error = NULL;
+        if (priv->dbus_registration != 0 && priv->connection != NULL) {
+            GError * error = NULL;
 
-			g_dbus_connection_emit_signal(priv->connection,
-										  NULL,
-										  priv->path,
-										  NOTIFICATION_ITEM_DBUS_IFACE,
-										  "NewIcon",
-										  NULL,
-										  &error);
+            g_dbus_connection_emit_signal(priv->connection,
+                                          NULL,
+                                          priv->path,
+                                          NOTIFICATION_ITEM_DBUS_IFACE,
+                                          "NewIcon",
+                                          NULL,
+                                          &error);
 
-			if (error != NULL) {
-				g_warning("Unable to send signal for NewIcon: %s", error->message);
-				g_error_free(error);
-			}
-		}
-	}
+            if (error != NULL) {
+                g_warning("Unable to send signal for NewIcon: %s", error->message);
+                g_error_free(error);
+            }
+        }
+    }
 
-	return;
+    return;
 }
 
 /**
@@ -2056,76 +2080,76 @@ app_indicator_set_icon_full (AppIndicator *self, const gchar *icon_name, const g
 void
 app_indicator_set_label (AppIndicator *self, const gchar * label, const gchar * guide)
 {
-	g_return_if_fail (IS_APP_INDICATOR (self));
-	/* Note: The label can be NULL, it's okay */
-	/* Note: The guide can be NULL, it's okay */
+    g_return_if_fail (APP_IS_INDICATOR (self));
+    /* Note: The label can be NULL, it's okay */
+    /* Note: The guide can be NULL, it's okay */
 
-	g_object_set(G_OBJECT(self),
-	             PROP_LABEL_S,       label == NULL ? "" : label,
-	             PROP_LABEL_GUIDE_S, guide == NULL ? "" : guide,
-	             NULL);
+    g_object_set(G_OBJECT(self),
+                 PROP_LABEL_S,       label == NULL ? "" : label,
+                 PROP_LABEL_GUIDE_S, guide == NULL ? "" : guide,
+                 NULL);
 
-	return;
+    return;
 }
 
 static const gchar *
 get_snap_prefix ()
 {
-	const gchar *snap = g_getenv ("SNAP");
-	return (snap && *snap != '\0') ? snap : NULL;
+    const gchar *snap = g_getenv ("SNAP");
+    return (snap && *snap != '\0') ? snap : NULL;
 }
 
 static gchar *
 append_snap_prefix (const gchar *path)
 {
-	gint i;
-	const gchar *snap = get_snap_prefix ();
-	g_autofree gchar *canon_path = NULL;
+    gint i;
+    const gchar *snap = get_snap_prefix ();
+    g_autofree gchar *canon_path = NULL;
 
-	if (snap != NULL && path != NULL) {
-		canon_path = realpath(path, NULL);
+    if (snap != NULL && path != NULL) {
+        canon_path = realpath(path, NULL);
 
-		if (g_str_has_prefix (canon_path, "/tmp/")) {
-			g_warning ("Using '/tmp' paths in SNAP environment will lead to unreadable resources");
-			return NULL;
-		}
+        if (g_str_has_prefix (canon_path, "/tmp/")) {
+            g_warning ("Using '/tmp' paths in SNAP environment will lead to unreadable resources");
+            return NULL;
+        }
 
-		if (g_str_has_prefix (canon_path, snap) ||
-			g_str_has_prefix (canon_path, g_get_home_dir ()) ||
-			g_str_has_prefix (canon_path, g_get_user_cache_dir ()) ||
-			g_str_has_prefix (canon_path, g_get_user_config_dir ()) ||
-			g_str_has_prefix (canon_path, g_get_user_data_dir ()) ||
-			g_str_has_prefix (canon_path, g_get_user_runtime_dir ())) {
-			return g_strdup (canon_path);
-		}
+        if (g_str_has_prefix (canon_path, snap) ||
+            g_str_has_prefix (canon_path, g_get_home_dir ()) ||
+            g_str_has_prefix (canon_path, g_get_user_cache_dir ()) ||
+            g_str_has_prefix (canon_path, g_get_user_config_dir ()) ||
+            g_str_has_prefix (canon_path, g_get_user_data_dir ()) ||
+            g_str_has_prefix (canon_path, g_get_user_runtime_dir ())) {
+            return g_strdup (canon_path);
+        }
 
-		for (i = 0; i < G_USER_N_DIRECTORIES; ++ i) {
-			if (g_str_has_prefix (canon_path, g_get_user_special_dir (i))) {
-				return g_strdup (canon_path);
-			}
-		}
+        for (i = 0; i < G_USER_N_DIRECTORIES; ++ i) {
+            if (g_str_has_prefix (canon_path, g_get_user_special_dir (i))) {
+                return g_strdup (canon_path);
+            }
+        }
 
-		return g_build_path (G_DIR_SEPARATOR_S, snap, canon_path, NULL);
-	}
+        return g_build_path (G_DIR_SEPARATOR_S, snap, canon_path, NULL);
+    }
 
-	return NULL;
+    return NULL;
 }
 
 static gchar *
 get_real_theme_path (AppIndicator * self)
 {
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	const gchar *theme_path = priv->icon_theme_path;
-	gchar *snapped_path = append_snap_prefix (theme_path);
+    const gchar *theme_path = priv->icon_theme_path;
+    gchar *snapped_path = append_snap_prefix (theme_path);
 
-	if (snapped_path != NULL) {
-		return snapped_path;
-	} else if (get_snap_prefix ()) {
-		return g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), "icons", NULL);
-	}
+    if (snapped_path != NULL) {
+        return snapped_path;
+    } else if (get_snap_prefix ()) {
+        return g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), "icons", NULL);
+    }
 
-	return NULL;
+    return NULL;
 }
 
 /**
@@ -2138,42 +2162,42 @@ get_real_theme_path (AppIndicator * self)
 void
 app_indicator_set_icon_theme_path (AppIndicator *self, const gchar *icon_theme_path)
 {
-	g_return_if_fail (IS_APP_INDICATOR (self));
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    g_return_if_fail (APP_IS_INDICATOR (self));
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	if (g_strcmp0 (priv->icon_theme_path, icon_theme_path) != 0) {
-		if (priv->icon_theme_path != NULL)
-			g_free(priv->icon_theme_path);
+    if (g_strcmp0 (priv->icon_theme_path, icon_theme_path) != 0) {
+        if (priv->icon_theme_path != NULL)
+            g_free(priv->icon_theme_path);
 
-		priv->icon_theme_path = g_strdup(icon_theme_path);
+        priv->icon_theme_path = g_strdup(icon_theme_path);
 
-		g_free (priv->absolute_icon_theme_path);
-		priv->absolute_icon_theme_path = get_real_theme_path (self);
+        g_free (priv->absolute_icon_theme_path);
+        priv->absolute_icon_theme_path = get_real_theme_path (self);
 
-		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, priv->icon_theme_path);
+        g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, priv->icon_theme_path);
 
-		if (priv->dbus_registration != 0 && priv->connection != NULL) {
-			const gchar *theme_path = priv->absolute_icon_theme_path ?
-										priv->absolute_icon_theme_path :
-										priv->icon_theme_path;
-			GError * error = NULL;
+        if (priv->dbus_registration != 0 && priv->connection != NULL) {
+            const gchar *theme_path = priv->absolute_icon_theme_path ?
+                                        priv->absolute_icon_theme_path :
+                                        priv->icon_theme_path;
+            GError * error = NULL;
 
-			g_dbus_connection_emit_signal(priv->connection,
-										  NULL,
-										  priv->path,
-										  NOTIFICATION_ITEM_DBUS_IFACE,
-										  "NewIconThemePath",
-										  g_variant_new("(s)", theme_path ? theme_path : ""),
-										  &error);
+            g_dbus_connection_emit_signal(priv->connection,
+                                          NULL,
+                                          priv->path,
+                                          NOTIFICATION_ITEM_DBUS_IFACE,
+                                          "NewIconThemePath",
+                                          g_variant_new("(s)", theme_path ? theme_path : ""),
+                                          &error);
 
-			if (error != NULL) {
-				g_warning("Unable to send signal for NewIconThemePath: %s", error->message);
-				g_error_free(error);
-			}
-		}
-	}
+            if (error != NULL) {
+                g_warning("Unable to send signal for NewIconThemePath: %s", error->message);
+                g_error_free(error);
+            }
+        }
+    }
 
-	return;
+    return;
 }
 
 /* Does the dbusmenu related work.  If there isn't a server, it builds
@@ -2182,28 +2206,28 @@ app_indicator_set_icon_theme_path (AppIndicator *self, const gchar *icon_theme_p
 static void
 setup_dbusmenu (AppIndicator *self)
 {
-	DbusmenuMenuitem *root = NULL;
+    DbusmenuMenuitem *root = NULL;
 
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	if (priv->menu) {
-		root = dbusmenu_gtk_parse_menu_structure(priv->menu);
-	}
+    if (priv->menu) {
+        root = dbusmenu_gtk_parse_menu_structure(priv->menu);
+    }
 
-	if (priv->menuservice == NULL) {
-		gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->clean_id);
-		priv->menuservice = dbusmenu_server_new (path);
-		g_free(path);
-	}
+    if (priv->menuservice == NULL) {
+        gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->clean_id);
+        priv->menuservice = dbusmenu_server_new (path);
+        g_free(path);
+    }
 
-	dbusmenu_server_set_root (priv->menuservice, root);
+    dbusmenu_server_set_root (priv->menuservice, root);
 
-	/* Drop our local ref as set_root should get it's own. */
-	if (root != NULL) {
-		g_object_unref(root);
-	}
+    /* Drop our local ref as set_root should get it's own. */
+    if (root != NULL) {
+        g_object_unref(root);
+    }
 
-	return;
+    return;
 }
 
 /**
@@ -2220,7 +2244,7 @@ setup_dbusmenu (AppIndicator *self)
 void
 app_indicator_set_menu (AppIndicator *self, GtkMenu *menu)
 {
-  g_return_if_fail (IS_APP_INDICATOR (self));
+  g_return_if_fail (APP_IS_INDICATOR (self));
   g_return_if_fail (GTK_IS_MENU (menu));
 
   AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
@@ -2258,13 +2282,13 @@ app_indicator_set_menu (AppIndicator *self, GtkMenu *menu)
 void
 app_indicator_set_ordering_index (AppIndicator *self, guint32 ordering_index)
 {
-	g_return_if_fail (IS_APP_INDICATOR (self));
+    g_return_if_fail (APP_IS_INDICATOR (self));
 
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	priv->ordering_index = ordering_index;
+    priv->ordering_index = ordering_index;
 
-	return;
+    return;
 }
 
 /**
@@ -2284,26 +2308,26 @@ app_indicator_set_ordering_index (AppIndicator *self, guint32 ordering_index)
 void
 app_indicator_set_secondary_activate_target (AppIndicator *self, GtkWidget *menuitem)
 {
-	g_return_if_fail (IS_APP_INDICATOR (self));
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    g_return_if_fail (APP_IS_INDICATOR (self));
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	if (priv->sec_activate_target) {
-		g_signal_handlers_disconnect_by_func (priv->sec_activate_target,
-		                                      sec_activate_target_parent_changed,
-		                                      self);
-		g_object_unref(G_OBJECT(priv->sec_activate_target));
-		priv->sec_activate_target = NULL;
-	}
+    if (priv->sec_activate_target) {
+        g_signal_handlers_disconnect_by_func (priv->sec_activate_target,
+                                              sec_activate_target_parent_changed,
+                                              self);
+        g_object_unref(G_OBJECT(priv->sec_activate_target));
+        priv->sec_activate_target = NULL;
+    }
 
-	if (menuitem == NULL) {
-		return;
-	}
+    if (menuitem == NULL) {
+        return;
+    }
 
-	g_return_if_fail (GTK_IS_WIDGET (menuitem));
+    g_return_if_fail (GTK_IS_WIDGET (menuitem));
 
-	priv->sec_activate_target = (GtkWidget*)g_object_ref(G_OBJECT(menuitem));
-	priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
-	g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self);
+    priv->sec_activate_target = (GtkWidget*)g_object_ref(G_OBJECT(menuitem));
+    priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
+    g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self);
 }
 
 /**
@@ -2327,13 +2351,13 @@ app_indicator_set_secondary_activate_target (AppIndicator *self, GtkWidget *menu
 void
 app_indicator_set_title (AppIndicator *self, const gchar * title)
 {
-	g_return_if_fail (IS_APP_INDICATOR (self));
+    g_return_if_fail (APP_IS_INDICATOR (self));
 
-	g_object_set(G_OBJECT(self),
-	             PROP_TITLE_S, title == NULL ? "": title,
-	             NULL);
+    g_object_set(G_OBJECT(self),
+                 PROP_TITLE_S, title == NULL ? "": title,
+                 NULL);
 
-	return;
+    return;
 }
 
 /**
@@ -2347,7 +2371,7 @@ app_indicator_set_title (AppIndicator *self, const gchar * title)
 const gchar *
 app_indicator_get_id (AppIndicator *self)
 {
-  g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+  g_return_val_if_fail (APP_IS_INDICATOR (self), NULL);
   AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
   return priv->id;
@@ -2364,7 +2388,7 @@ app_indicator_get_id (AppIndicator *self)
 AppIndicatorCategory
 app_indicator_get_category (AppIndicator *self)
 {
-  g_return_val_if_fail (IS_APP_INDICATOR (self), APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+  g_return_val_if_fail (APP_IS_INDICATOR (self), APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
   AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
   return priv->category;
@@ -2381,7 +2405,7 @@ app_indicator_get_category (AppIndicator *self)
 AppIndicatorStatus
 app_indicator_get_status (AppIndicator *self)
 {
-  g_return_val_if_fail (IS_APP_INDICATOR (self), APP_INDICATOR_STATUS_PASSIVE);
+  g_return_val_if_fail (APP_IS_INDICATOR (self), APP_INDICATOR_STATUS_PASSIVE);
   AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
   return priv->status;
@@ -2398,7 +2422,7 @@ app_indicator_get_status (AppIndicator *self)
 const gchar *
 app_indicator_get_icon (AppIndicator *self)
 {
-  g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+  g_return_val_if_fail (APP_IS_INDICATOR (self), NULL);
   AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
   return priv->icon_name;
@@ -2415,7 +2439,7 @@ app_indicator_get_icon (AppIndicator *self)
 const gchar *
 app_indicator_get_icon_desc (AppIndicator *self)
 {
-  g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+  g_return_val_if_fail (APP_IS_INDICATOR (self), NULL);
   AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
   return priv->accessible_desc;
@@ -2432,7 +2456,7 @@ app_indicator_get_icon_desc (AppIndicator *self)
 const gchar *
 app_indicator_get_icon_theme_path (AppIndicator *self)
 {
-  g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+  g_return_val_if_fail (APP_IS_INDICATOR (self), NULL);
   AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
   return priv->icon_theme_path;
@@ -2449,7 +2473,7 @@ app_indicator_get_icon_theme_path (AppIndicator *self)
 const gchar *
 app_indicator_get_attention_icon (AppIndicator *self)
 {
-  g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+  g_return_val_if_fail (APP_IS_INDICATOR (self), NULL);
   AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
   return priv->attention_icon_name;
@@ -2466,7 +2490,7 @@ app_indicator_get_attention_icon (AppIndicator *self)
 const gchar *
 app_indicator_get_attention_icon_desc (AppIndicator *self)
 {
-  g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+  g_return_val_if_fail (APP_IS_INDICATOR (self), NULL);
   AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
   return priv->att_accessible_desc;
@@ -2487,9 +2511,9 @@ app_indicator_get_attention_icon_desc (AppIndicator *self)
 const gchar *
 app_indicator_get_title (AppIndicator *self)
 {
-	g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
-	return priv->title;
+    g_return_val_if_fail (APP_IS_INDICATOR (self), NULL);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    return priv->title;
 }
 
 
@@ -2505,11 +2529,11 @@ app_indicator_get_title (AppIndicator *self)
 GtkMenu *
 app_indicator_get_menu (AppIndicator *self)
 {
-	g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+    g_return_val_if_fail (APP_IS_INDICATOR (self), NULL);
 
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	return GTK_MENU(priv->menu);
+    return GTK_MENU(priv->menu);
 }
 
 /**
@@ -2523,7 +2547,7 @@ app_indicator_get_menu (AppIndicator *self)
 const gchar *
 app_indicator_get_label (AppIndicator *self)
 {
-  g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+  g_return_val_if_fail (APP_IS_INDICATOR (self), NULL);
   AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
   return priv->label;
@@ -2540,7 +2564,7 @@ app_indicator_get_label (AppIndicator *self)
 const gchar *
 app_indicator_get_label_guide (AppIndicator *self)
 {
-  g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+  g_return_val_if_fail (APP_IS_INDICATOR (self), NULL);
   AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
   return priv->label_guide;
@@ -2557,14 +2581,14 @@ app_indicator_get_label_guide (AppIndicator *self)
 guint32
 app_indicator_get_ordering_index (AppIndicator *self)
 {
-	g_return_val_if_fail (IS_APP_INDICATOR (self), 0);
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    g_return_val_if_fail (APP_IS_INDICATOR (self), 0);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	if (priv->ordering_index == 0) {
-		return _generate_id(priv->category, priv->id);
-	} else {
-		return priv->ordering_index;
-	}
+    if (priv->ordering_index == 0) {
+        return _generate_id(priv->category, priv->id);
+    } else {
+        return priv->ordering_index;
+    }
 }
 
 /**
@@ -2578,10 +2602,10 @@ app_indicator_get_ordering_index (AppIndicator *self)
 GtkWidget *
 app_indicator_get_secondary_activate_target (AppIndicator *self)
 {
-	g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    g_return_val_if_fail (APP_IS_INDICATOR (self), NULL);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	return GTK_WIDGET(priv->sec_activate_target);
+    return GTK_WIDGET(priv->sec_activate_target);
 }
 
 #define APP_INDICATOR_SHORTY_NICK "app-indicator-shorty-nick"
@@ -2591,18 +2615,18 @@ app_indicator_get_secondary_activate_target (AppIndicator *self)
 static void
 shorty_activated_cb (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data)
 {
-	gchar * nick = g_object_get_data(G_OBJECT(mi), APP_INDICATOR_SHORTY_NICK);
-	g_return_if_fail(nick != NULL);
+    gchar * nick = g_object_get_data(G_OBJECT(mi), APP_INDICATOR_SHORTY_NICK);
+    g_return_if_fail(nick != NULL);
 
-	g_return_if_fail(IS_APP_INDICATOR(user_data));
-	AppIndicator * self = APP_INDICATOR(user_data);
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    g_return_if_fail(APP_IS_INDICATOR(user_data));
+    AppIndicator * self = APP_INDICATOR(user_data);
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	g_return_if_fail(priv->shorties != NULL);
+    g_return_if_fail(priv->shorties != NULL);
 
-	indicator_desktop_shortcuts_nick_exec_with_context(priv->shorties, nick, NULL);
+    indicator_desktop_shortcuts_nick_exec_with_context(priv->shorties, nick, NULL);
 
-	return;
+    return;
 }
 
 /**
@@ -2617,49 +2641,49 @@ shorty_activated_cb (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data)
 void
 app_indicator_build_menu_from_desktop (AppIndicator * self, const gchar * desktop_file, const gchar * desktop_profile)
 {
-	g_return_if_fail(IS_APP_INDICATOR(self));
-	AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
+    g_return_if_fail(APP_IS_INDICATOR(self));
+    AppIndicatorPrivate * priv = app_indicator_get_instance_private(self);
 
-	/* Build a new shortcuts object */
-	if (priv->shorties != NULL) {
-		g_object_unref(priv->shorties);
-		priv->shorties = NULL;
-	}
-	priv->shorties = indicator_desktop_shortcuts_new(desktop_file, desktop_profile);
-	g_return_if_fail(priv->shorties != NULL);
+    /* Build a new shortcuts object */
+    if (priv->shorties != NULL) {
+        g_object_unref(priv->shorties);
+        priv->shorties = NULL;
+    }
+    priv->shorties = indicator_desktop_shortcuts_new(desktop_file, desktop_profile);
+    g_return_if_fail(priv->shorties != NULL);
 
-	const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(priv->shorties);
-	int nick_num;
+    const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(priv->shorties);
+    int nick_num;
 
-	/* Place the items on a dbusmenu */
-	DbusmenuMenuitem * root = dbusmenu_menuitem_new();
+    /* Place the items on a dbusmenu */
+    DbusmenuMenuitem * root = dbusmenu_menuitem_new();
 
-	for (nick_num = 0; nicks[nick_num] != NULL; nick_num++) {
-		DbusmenuMenuitem * item = dbusmenu_menuitem_new();
-		g_object_set_data(G_OBJECT(item), APP_INDICATOR_SHORTY_NICK, (gpointer)nicks[nick_num]);
+    for (nick_num = 0; nicks[nick_num] != NULL; nick_num++) {
+        DbusmenuMenuitem * item = dbusmenu_menuitem_new();
+        g_object_set_data(G_OBJECT(item), APP_INDICATOR_SHORTY_NICK, (gpointer)nicks[nick_num]);
 
-		gchar * name = indicator_desktop_shortcuts_nick_get_name(priv->shorties, nicks[nick_num]);
-		dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, name);
-		g_free(name);
+        gchar * name = indicator_desktop_shortcuts_nick_get_name(priv->shorties, nicks[nick_num]);
+        dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, name);
+        g_free(name);
 
-		g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(shorty_activated_cb), self);
+        g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(shorty_activated_cb), self);
 
-		dbusmenu_menuitem_child_append(root, item);
-	}
+        dbusmenu_menuitem_child_append(root, item);
+    }
 
-	/* Swap it if needed */
-	if (priv->menuservice == NULL) {
-		gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->clean_id);
-		priv->menuservice = dbusmenu_server_new (path);
-		g_free(path);
-	}
+    /* Swap it if needed */
+    if (priv->menuservice == NULL) {
+        gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->clean_id);
+        priv->menuservice = dbusmenu_server_new (path);
+        g_free(path);
+    }
 
-	dbusmenu_server_set_root (priv->menuservice, root);
+    dbusmenu_server_set_root (priv->menuservice, root);
 
-	if (priv->menu != NULL) {
-		g_object_unref(G_OBJECT(priv->menu));
-		priv->menu = NULL;
-	}
+    if (priv->menu != NULL) {
+        g_object_unref(G_OBJECT(priv->menu));
+        priv->menu = NULL;
+    }
 
-	return;
+    return;
 }
diff --git a/src/app-indicator.h b/src/app-indicator.h
index 2e48038..c1bc9d6 100644
--- a/src/app-indicator.h
+++ b/src/app-indicator.h
@@ -52,13 +52,13 @@ G_BEGIN_DECLS
  * Safely convert a #GObjectClass into a #AppIndicatorClass.
  */
 /**
- * IS_APP_INDICATOR:
+ * APP_IS_INDICATOR:
  * @obj: An #GObject to check
  *
  * Checks to see if @obj is in the object hierarchy of #AppIndicator.
  */
 /**
- * IS_APP_INDICATOR_CLASS:
+ * APP_IS_INDICATOR_CLASS:
  * @klass: An #GObjectClass to check
  *
  * Checks to see if @klass is in the object class hierarchy of #AppIndicatorClass.
@@ -73,8 +73,8 @@ G_BEGIN_DECLS
 #define APP_INDICATOR_TYPE            (app_indicator_get_type ())
 #define APP_INDICATOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), APP_INDICATOR_TYPE, AppIndicator))
 #define APP_INDICATOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), APP_INDICATOR_TYPE, AppIndicatorClass))
-#define IS_APP_INDICATOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APP_INDICATOR_TYPE))
-#define IS_APP_INDICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), APP_INDICATOR_TYPE))
+#define APP_IS_INDICATOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APP_INDICATOR_TYPE))
+#define APP_IS_INDICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), APP_INDICATOR_TYPE))
 #define APP_INDICATOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), APP_INDICATOR_TYPE, AppIndicatorClass))
 
 /**
@@ -127,16 +127,16 @@ G_BEGIN_DECLS
  * @APP_INDICATOR_CATEGORY_SYSTEM_SERVICES: A system indicator relating to something in the user's system.
  * @APP_INDICATOR_CATEGORY_HARDWARE: An indicator relating to the user's hardware.
  * @APP_INDICATOR_CATEGORY_OTHER: Something not defined in this enum, please don't use unless you really need it.
- * 
+ *
  * The category provides grouping for the indicators so that
  * users can find indicators that are similar together.
  */
 typedef enum { /*< prefix=APP_INDICATOR_CATEGORY >*/
-	APP_INDICATOR_CATEGORY_APPLICATION_STATUS, /*< nick=ApplicationStatus >*/
-	APP_INDICATOR_CATEGORY_COMMUNICATIONS, /*< nick=Communications >*/
-	APP_INDICATOR_CATEGORY_SYSTEM_SERVICES, /*< nick=SystemServices >*/
-	APP_INDICATOR_CATEGORY_HARDWARE, /*< nick=Hardware >*/
-	APP_INDICATOR_CATEGORY_OTHER /*< nick=Other >*/
+    APP_INDICATOR_CATEGORY_APPLICATION_STATUS, /*< nick=ApplicationStatus >*/
+    APP_INDICATOR_CATEGORY_COMMUNICATIONS, /*< nick=Communications >*/
+    APP_INDICATOR_CATEGORY_SYSTEM_SERVICES, /*< nick=SystemServices >*/
+    APP_INDICATOR_CATEGORY_HARDWARE, /*< nick=Hardware >*/
+    APP_INDICATOR_CATEGORY_OTHER /*< nick=Other >*/
 } AppIndicatorCategory;
 
 /**
@@ -151,9 +151,9 @@ typedef enum { /*< prefix=APP_INDICATOR_CATEGORY >*/
  * shown by setting it to @APP_INDICATOR_STATUS_ACTIVE.
  */
 typedef enum { /*< prefix=APP_INDICATOR_STATUS >*/
-	APP_INDICATOR_STATUS_PASSIVE, /*< nick=Passive >*/
-	APP_INDICATOR_STATUS_ACTIVE, /*< nick=Active >*/
-	APP_INDICATOR_STATUS_ATTENTION /*< nick=NeedsAttention >*/
+    APP_INDICATOR_STATUS_PASSIVE, /*< nick=Passive >*/
+    APP_INDICATOR_STATUS_ACTIVE, /*< nick=Active >*/
+    APP_INDICATOR_STATUS_ATTENTION /*< nick=NeedsAttention >*/
 } AppIndicatorStatus;
 
 typedef struct _AppIndicator        AppIndicator;
@@ -180,54 +180,54 @@ typedef struct _AppIndicatorClass   AppIndicatorClass;
  * @app_indicator_reserved_4: Reserved for future use.
  * @app_indicator_reserved_5: Reserved for future use.
  * @app_indicator_reserved_6: Reserved for future use.
- * 
+ *
  * The signals and external functions that make up the #AppIndicator
  * class object.
  */
 struct _AppIndicatorClass {
-	/* Parent */
-	GObjectClass parent_class;
-
-	/* DBus Signals */
-	void (* new_icon)               (AppIndicator      *indicator,
-	                                 gpointer            user_data);
-	void (* new_attention_icon)     (AppIndicator      *indicator,
-	                                 gpointer            user_data);
-	void (* new_status)             (AppIndicator      *indicator,
-	                                 const gchar       *status,
-	                                 gpointer            user_data);
-	void (* new_icon_theme_path)    (AppIndicator      *indicator,
-	                                 const gchar       *icon_theme_path,
-	                                 gpointer            user_data);
-	void (* new_label)              (AppIndicator       *indicator,
-	                                 const gchar        *label,
-	                                 const gchar        *guide,
-	                                 gpointer            user_data);
-
-	/* Local Signals */
-	void (* connection_changed)     (AppIndicator * indicator,
-	                                 gboolean          connected,
-	                                 gpointer          user_data);
-
-	void (* scroll_event)           (AppIndicator * indicator,
-	                                 gint                  delta,
-	                                 GdkScrollDirection direction,
-	                                 gpointer          user_data);
-
-	void (*app_indicator_reserved_ats)(void);
-
-	/* Overridable Functions */
-	GtkStatusIcon * (*fallback)     (AppIndicator * indicator);
-	void (*unfallback)              (AppIndicator * indicator,
-	                                 GtkStatusIcon * status_icon);
-
-	/* Reserved */
-	void (*app_indicator_reserved_1)(void);
-	void (*app_indicator_reserved_2)(void);
-	void (*app_indicator_reserved_3)(void);
-	void (*app_indicator_reserved_4)(void);
-	void (*app_indicator_reserved_5)(void);
-	void (*app_indicator_reserved_6)(void);
+    /* Parent */
+    GObjectClass parent_class;
+
+    /* DBus Signals */
+    void (* new_icon)               (AppIndicator      *indicator,
+                                     gpointer            user_data);
+    void (* new_attention_icon)     (AppIndicator      *indicator,
+                                     gpointer            user_data);
+    void (* new_status)             (AppIndicator      *indicator,
+                                     const gchar       *status,
+                                     gpointer            user_data);
+    void (* new_icon_theme_path)    (AppIndicator      *indicator,
+                                     const gchar       *icon_theme_path,
+                                     gpointer            user_data);
+    void (* new_label)              (AppIndicator       *indicator,
+                                     const gchar        *label,
+                                     const gchar        *guide,
+                                     gpointer            user_data);
+
+    /* Local Signals */
+    void (* connection_changed)     (AppIndicator * indicator,
+                                     gboolean          connected,
+                                     gpointer          user_data);
+
+    void (* scroll_event)           (AppIndicator * indicator,
+                                     gint                  delta,
+                                     GdkScrollDirection direction,
+                                     gpointer          user_data);
+
+    void (*app_indicator_reserved_ats)(void);
+
+    /* Overridable Functions */
+    GtkStatusIcon * (*fallback)     (AppIndicator * indicator);
+    void (*unfallback)              (AppIndicator * indicator,
+                                     GtkStatusIcon * status_icon);
+
+    /* Reserved */
+    void (*app_indicator_reserved_1)(void);
+    void (*app_indicator_reserved_2)(void);
+    void (*app_indicator_reserved_3)(void);
+    void (*app_indicator_reserved_4)(void);
+    void (*app_indicator_reserved_5)(void);
+    void (*app_indicator_reserved_6)(void);
 };
 
 /**
@@ -242,7 +242,7 @@ struct _AppIndicatorClass {
  *
  */
 struct _AppIndicator {
-	GObject parent;
+    GObject parent;
 };
 
 /* GObject Stuff */
diff --git a/src/application-service-marshal.list b/src/application-service-marshal.list
index ae3aa6f..b6dc87a 100644
--- a/src/application-service-marshal.list
+++ b/src/application-service-marshal.list
@@ -1,9 +1,11 @@
 # Marshaller definitions to be generated.
 # 
 # Copyright 2009 Canonical Ltd.
+# Copyright 2022 Robert Tari
 # 
 # Authors:
 #    Ted Gould <ted@canonical.com>
+#    Robert Tari <robert@tari.in>
 # 
 # This program is free software: you can redistribute it and/or modify it 
 # under the terms of the GNU General Public License version 3, as published 
@@ -20,6 +22,6 @@ VOID: STRING, INT, STRING, STRING, STRING, STRING, STRING
 VOID: INT, STRING, STRING
 VOID: INT, STRING
 VOID: STRING, STRING
-VOID: BOOL, STRING, OBJECT
+VOID: BOOLEAN, STRING, OBJECT
 VOID: INT, UINT
 VOID: INT, INT