Fix remaining deprecation warnings

5 files changed, 59 insertions, 24 deletions

diff --git a/bindings/vala/examples/ayatana-indicator-example.vala b/bindings/vala/examples/ayatana-indicator-example.vala
index 4804314..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,6 +16,7 @@
  *
  * Authors:
  *   Marco Trevisan (Treviño) <mail@3v1n0.net>
+ *   Robert Tari <robert@tari.in>
  */
 
 using Gtk;
@@ -37,7 +39,7 @@ public class IndicatorExample {
         if (!(indicator is Indicator)) return -1;
 
         indicator.set_status(IndicatorStatus.ACTIVE);
-        indicator.set_attention_icon("indicator-messages-new");
+        indicator.set_attention_icon_full("indicator-messages-new", null);
 
         var menu = new Gtk.Menu();
 
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/simple-client-vala.vala b/example/simple-client-vala.vala
index 510056a..5b3af11 100644
--- a/example/simple-client-vala.vala
+++ b/example/simple-client-vala.vala
@@ -3,9 +3,11 @@ 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
@@ -44,7 +46,7 @@ class SimpleClient {
                            IndicatorCategory.APPLICATION_STATUS);
 
         ci.set_status(IndicatorStatus.ACTIVE);
-        ci.set_attention_icon("indicator-messages-new");
+        ci.set_attention_icon_full("indicator-messages-new", null);
         ci.set_label("1%", "100%");
         ci.set_title("Test Indicator (vala)");
 
@@ -135,10 +137,17 @@ class SimpleClient {
         menu.append(toggle_item);
         toggle_item.show();
 
-        var imgitem = new Gtk.ImageMenuItem.from_stock(Stock.NEW, null);
+        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(() => {
-            Image img = (Image) imgitem.get_image();
-            img.set_from_stock(Stock.OPEN, IconSize.MENU);
+            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();
@@ -167,9 +176,9 @@ class SimpleClient {
         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");
+                ci.set_icon_full("simple-client-test-icon.png", null);
             } else {
-                ci.set_icon("indicator-messages");
+                ci.set_icon_full("indicator-messages", null);
             }
         });
         menu.append(icon);
diff --git a/example/simple-client.c b/example/simple-client.c
index fbea377..9155257 100644
--- a/example/simple-client.c
+++ b/example/simple-client.c
@@ -3,9 +3,11 @@ 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
@@ -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
@@ -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/application-service-marshal.list b/src/application-service-marshal.list
index 7b62a21..b6dc87a 100644
--- a/src/application-service-marshal.list
+++ b/src/application-service-marshal.list
@@ -1,25 +1,27 @@
 # Marshaller definitions to be generated.
-#
+# 
 # Copyright 2009 Canonical Ltd.
-#
+# Copyright 2022 Robert Tari
+# 
 # Authors:
 #    Ted Gould <ted@canonical.com>
-#
-# 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
+#    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 
 # 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/>.
 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