From 483cd99b3329e7342b9ddc6df32210b5676fe393 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 10 Mar 2023 15:27:25 +0100 Subject: src/AyatanaAppIndicator*-0.1.metadata: Drop unused metadata --- src/AyatanaAppIndicator-0.1.metadata | 2 -- src/AyatanaAppIndicator3-0.1.metadata | 2 -- 2 files changed, 4 deletions(-) (limited to 'src') diff --git a/src/AyatanaAppIndicator-0.1.metadata b/src/AyatanaAppIndicator-0.1.metadata index 09d457d..ad20f4e 100644 --- a/src/AyatanaAppIndicator-0.1.metadata +++ b/src/AyatanaAppIndicator-0.1.metadata @@ -1,3 +1 @@ AyatanaAppIndicator3 name="AppIndicator" -Indicator.priv hidden="1" -IndicatorPrivate hidden="1" diff --git a/src/AyatanaAppIndicator3-0.1.metadata b/src/AyatanaAppIndicator3-0.1.metadata index 09d457d..ad20f4e 100644 --- a/src/AyatanaAppIndicator3-0.1.metadata +++ b/src/AyatanaAppIndicator3-0.1.metadata @@ -1,3 +1 @@ AyatanaAppIndicator3 name="AppIndicator" -Indicator.priv hidden="1" -IndicatorPrivate hidden="1" -- cgit v1.2.3 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(-) (limited to 'src') 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 From f7f4a8dd6b12327e37f918a2f5f65e3a0a8dc413 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 10 Mar 2023 19:21:40 +0100 Subject: src/app-indicator.c: Fix documentation related errors --- src/app-indicator.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/app-indicator.c b/src/app-indicator.c index 70c7536..c44b3a4 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -142,7 +142,8 @@ enum { PROP_LABEL_GUIDE, PROP_ORDERING_INDEX, PROP_DBUS_MENU_SERVER, - PROP_TITLE + PROP_TITLE, + PROP_MENU }; /* The strings so that they can be slowly looked up. */ @@ -160,6 +161,7 @@ enum { #define PROP_ORDERING_INDEX_S "ordering-index" #define PROP_DBUS_MENU_SERVER_S "dbus-menu-server" #define PROP_TITLE_S "title" +#define PROP_MENU_S "menu" /* Default Path */ #define DEFAULT_ITEM_PATH "/org/ayatana/NotificationItem" @@ -497,6 +499,20 @@ app_indicator_class_init (AppIndicatorClass *klass) NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** + * AppIndicator:menu: + * + * The menu that should be shown when the Application Indicator + * is clicked on in the panel. + */ + g_object_class_install_property(object_class, + PROP_MENU, + g_param_spec_string (PROP_MENU_S, + "The menu of the application indicator", + "The menu that should be shown when the Application Indicator is clicked on in the panel.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /* Signals */ /** @@ -1031,6 +1047,11 @@ G_GNUC_END_IGNORE_DEPRECATIONS priv->menuservice = DBUSMENU_SERVER (g_value_dup_object(value)); break; + case PROP_MENU: + g_clear_object (&priv->menu); + priv->menu = GTK_WIDGET (g_value_dup_object(value)); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1117,6 +1138,10 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa g_value_set_string(value, priv->title); break; + case PROP_MENU: + g_value_set_object(value, priv->menu); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -2006,7 +2031,7 @@ app_indicator_set_icon (AppIndicator *self, const gchar *icon_name) * application icon for the program. * * Wrapper function for property #AppIndicator:icon-name and - * #AppIndicator::icon-desc. + * #AppIndicator:icon-desc. */ void app_indicator_set_icon_full (AppIndicator *self, const gchar *icon_name, const gchar * icon_desc) @@ -2074,7 +2099,7 @@ app_indicator_set_icon_full (AppIndicator *self, const gchar *icon_name, const g * @guide: A guide to size the label correctly. * * This is a wrapper function for the #AppIndicator:label and - * #AppIndicator:guide properties. This function can take #NULL + * #AppIndicator:label-guide properties. This function can take #NULL * as either @label or @guide and will clear the entries. */ void @@ -2300,7 +2325,7 @@ app_indicator_set_ordering_index (AppIndicator *self, guint32 ordering_index) * middle-click) is emitted over the #AppIndicator icon/label. * * The @menuitem can be also a complex #GtkWidget, but to get activated when - * a secondary activation occurs in the #Appindicator, it must be a visible and + * a secondary activation occurs in the #AppIndicator, it must be a visible and * active child (or inner-child) of the #AppIndicator:menu. * * Setting @menuitem to %NULL causes to disable this feature. -- cgit v1.2.3 From d848644c60d5d60a831bcb286c521508fa4f3fde Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sat, 11 Mar 2023 18:31:29 +0100 Subject: src/app-indicator.c: Don't use GNU old-style field designator extension --- src/app-indicator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/app-indicator.c b/src/app-indicator.c index c44b3a4..ebedc65 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -3,7 +3,7 @@ An object to represent the application as an application indicator in the system panel. Copyright 2009 Canonical Ltd. -Copyright 2022 Robert Tari +Copyright 2022-2023 Robert Tari Authors: Ted Gould @@ -207,9 +207,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 */ -- cgit v1.2.3