Revert "Explicitly mark deprecated functions and use substitutes"

This reverts commit aec1741226036036b2498f7b664221e649b4ff81.

4 files changed, 12 insertions, 18 deletions

diff --git a/src/app-indicator.h b/src/app-indicator.h
index 7002d35..b53b7fd 100644
--- a/src/app-indicator.h
+++ b/src/app-indicator.h
@@ -267,14 +267,14 @@ AppIndicator                   *app_indicator_new_with_path      (const gchar
 void                            app_indicator_set_status         (AppIndicator       *self,
                                                                   AppIndicatorStatus  status);
 void                            app_indicator_set_attention_icon (AppIndicator       *self,
-                                                                  const gchar        *icon_name) G_GNUC_DEPRECATED_FOR (app_indicator_set_attention_icon_full);
+                                                                  const gchar        *icon_name);
 void                            app_indicator_set_attention_icon_full (AppIndicator       *self,
                                                                   const gchar        *icon_name,
                                                                   const gchar        *icon_desc);
 void                            app_indicator_set_menu           (AppIndicator       *self,
                                                                   GtkMenu            *menu);
 void                            app_indicator_set_icon           (AppIndicator       *self,
-                                                                  const gchar        *icon_name) G_GNUC_DEPRECATED_FOR (app_indicator_set_icon_full);
+                                                                  const gchar        *icon_name);
 void                            app_indicator_set_icon_full      (AppIndicator       *self,
                                                                   const gchar        *icon_name,
                                                                   const gchar        *icon_desc);
diff --git a/tests/test-libappindicator-dbus-server.c b/tests/test-libappindicator-dbus-server.c
index fdc760e..affa5ea 100644
--- a/tests/test-libappindicator-dbus-server.c
+++ b/tests/test-libappindicator-dbus-server.c
@@ -3,11 +3,9 @@ Tests for the libappindicator library that are over DBus.  This is
 the server side of those tests.
 
 Copyright 2009 Canonical Ltd.
-Copyright 2023 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
@@ -44,7 +42,7 @@ main (gint argc, gchar * argv[])
     AppIndicator * ci = app_indicator_new (TEST_ID, TEST_ICON_NAME, TEST_CATEGORY);
 
     app_indicator_set_status (ci, TEST_STATE);
-    app_indicator_set_attention_icon_full (ci, TEST_ATTENTION_ICON_NAME, NULL);
+    app_indicator_set_attention_icon (ci, TEST_ATTENTION_ICON_NAME);
 
     GtkMenu * menu = GTK_MENU(gtk_menu_new());
     GtkMenuItem * item = GTK_MENU_ITEM(gtk_menu_item_new_with_label("Label"));
diff --git a/tests/test-libappindicator-status-server.c b/tests/test-libappindicator-status-server.c
index 72e0955..72ffcdd 100644
--- a/tests/test-libappindicator-status-server.c
+++ b/tests/test-libappindicator-status-server.c
@@ -3,11 +3,9 @@ Tests for the libappindicator library that are over DBus.  This is
 the server side of those tests.
 
 Copyright 2009 Canonical Ltd.
-Copyright 2023 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
@@ -70,7 +68,7 @@ main (gint argc, gchar * argv[])
     g_debug("DBus Name: %s", g_dbus_connection_get_unique_name (connection));
 
     AppIndicator * ci = app_indicator_new ("my-id", "my-icon-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-    app_indicator_set_attention_icon_full (ci, "my-attention-icon", NULL);
+    app_indicator_set_attention_icon (ci, "my-attention-icon");
 
     GtkMenu * menu = GTK_MENU(gtk_menu_new());
     GtkMenuItem * item = GTK_MENU_ITEM(gtk_menu_item_new_with_label("Label"));
diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c
index 0273398..1a9b80c 100644
--- a/tests/test-libappindicator.c
+++ b/tests/test-libappindicator.c
@@ -2,11 +2,9 @@
 Tests for the libappindicator library.
 
 Copyright 2009 Canonical Ltd.
-Copyright 2023 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
@@ -79,28 +77,28 @@ test_libappindicator_prop_signals (void)
 
 
     signaled = FALSE;
-    app_indicator_set_icon_full (ci, "bob", NULL);
+    app_indicator_set_icon(ci, "bob");
     g_assert(signaled);
 
     signaled = FALSE;
-    app_indicator_set_icon_full (ci, "bob", NULL);
+    app_indicator_set_icon(ci, "bob");
     g_assert(!signaled);
 
     signaled = FALSE;
-    app_indicator_set_icon_full (ci, "al", NULL);
+    app_indicator_set_icon(ci, "al");
     g_assert(signaled);
 
 
     signaled = FALSE;
-    app_indicator_set_attention_icon_full (ci, "bob", NULL);
+    app_indicator_set_attention_icon(ci, "bob");
     g_assert(signaled);
 
     signaled = FALSE;
-    app_indicator_set_attention_icon_full (ci, "bob", NULL);
+    app_indicator_set_attention_icon(ci, "bob");
     g_assert(!signaled);
 
     signaled = FALSE;
-    app_indicator_set_attention_icon_full (ci, "al", NULL);
+    app_indicator_set_attention_icon(ci, "al");
     g_assert(signaled);
 
 
@@ -135,7 +133,7 @@ test_libappindicator_init_set_props (void)
     g_assert(ci != NULL);
 
     app_indicator_set_status(ci, APP_INDICATOR_STATUS_ACTIVE);
-    app_indicator_set_attention_icon_full (ci, "my-attention-name", NULL);
+    app_indicator_set_attention_icon(ci, "my-attention-name");
     app_indicator_set_title(ci, "My Title");
 
     g_assert(!g_strcmp0("my-id", app_indicator_get_id(ci)));
@@ -159,7 +157,7 @@ test_libappindicator_init_with_props (void)
                                                APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
 
         app_indicator_set_status (ci, APP_INDICATOR_STATUS_ACTIVE);
-        app_indicator_set_attention_icon_full (ci, "my-attention-name", NULL);
+        app_indicator_set_attention_icon (ci, "my-attention-name");
 
     g_assert(ci != NULL);