From aec1741226036036b2498f7b664221e649b4ff81 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 10 Mar 2023 16:59:27 +0100 Subject: Explicitly mark deprecated functions and use substitutes --- src/app-indicator.h | 4 ++-- tests/test-libappindicator-dbus-server.c | 4 +++- tests/test-libappindicator-status-server.c | 4 +++- tests/test-libappindicator.c | 18 ++++++++++-------- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/app-indicator.h b/src/app-indicator.h index c1bc9d6..75cf875 100644 --- a/src/app-indicator.h +++ b/src/app-indicator.h @@ -260,14 +260,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); + const gchar *icon_name) G_GNUC_DEPRECATED_FOR (app_indicator_set_attention_icon_full); 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); + const gchar *icon_name) G_GNUC_DEPRECATED_FOR (app_indicator_set_icon_full); 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 affa5ea..fdc760e 100644 --- a/tests/test-libappindicator-dbus-server.c +++ b/tests/test-libappindicator-dbus-server.c @@ -3,9 +3,11 @@ 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 + 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 @@ -42,7 +44,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 (ci, TEST_ATTENTION_ICON_NAME); + app_indicator_set_attention_icon_full (ci, TEST_ATTENTION_ICON_NAME, NULL); 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 72ffcdd..72e0955 100644 --- a/tests/test-libappindicator-status-server.c +++ b/tests/test-libappindicator-status-server.c @@ -3,9 +3,11 @@ 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 + 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 @@ -68,7 +70,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 (ci, "my-attention-icon"); + app_indicator_set_attention_icon_full (ci, "my-attention-icon", NULL); 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 7bf4c62..68c6a93 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -2,9 +2,11 @@ Tests for the libappindicator library. Copyright 2009 Canonical Ltd. +Copyright 2023 Robert Tari Authors: Ted Gould + 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 @@ -80,28 +82,28 @@ test_libappindicator_prop_signals (void) signaled = FALSE; - app_indicator_set_icon(ci, "bob"); + app_indicator_set_icon_full (ci, "bob", NULL); g_assert(signaled); signaled = FALSE; - app_indicator_set_icon(ci, "bob"); + app_indicator_set_icon_full (ci, "bob", NULL); g_assert(!signaled); signaled = FALSE; - app_indicator_set_icon(ci, "al"); + app_indicator_set_icon_full (ci, "al", NULL); g_assert(signaled); signaled = FALSE; - app_indicator_set_attention_icon(ci, "bob"); + app_indicator_set_attention_icon_full (ci, "bob", NULL); g_assert(signaled); signaled = FALSE; - app_indicator_set_attention_icon(ci, "bob"); + app_indicator_set_attention_icon_full (ci, "bob", NULL); g_assert(!signaled); signaled = FALSE; - app_indicator_set_attention_icon(ci, "al"); + app_indicator_set_attention_icon_full (ci, "al", NULL); g_assert(signaled); @@ -136,7 +138,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(ci, "my-attention-name"); + app_indicator_set_attention_icon_full (ci, "my-attention-name", NULL); app_indicator_set_title(ci, "My Title"); g_assert(!g_strcmp0("my-id", app_indicator_get_id(ci))); @@ -160,7 +162,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 (ci, "my-attention-name"); + app_indicator_set_attention_icon_full (ci, "my-attention-name", NULL); g_assert(ci != NULL); -- cgit v1.2.3