From a03db44b2b4881fecac9f67d5c64bf11ef3b803b7b9987f69cdaf266ba055d61 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 10 Jun 2019 08:22:14 +0000 Subject: [PATCH] Accepting request 703213 from home:mauriziogalli:branches:X11:Unity - Drop libappindicator-activate-support.patch as it's no longer needed and breaks context menu / actions in fall-back mode (boo#1132659) OBS-URL: https://build.opensuse.org/request/show/703213 OBS-URL: https://build.opensuse.org/package/show/X11:Unity/libappindicator?expand=0&rev=19 --- libappindicator-activate-support.patch | 126 ------------------------- libappindicator.changes | 6 ++ libappindicator.spec | 3 - 3 files changed, 6 insertions(+), 129 deletions(-) delete mode 100644 libappindicator-activate-support.patch diff --git a/libappindicator-activate-support.patch b/libappindicator-activate-support.patch deleted file mode 100644 index 24cba63..0000000 --- a/libappindicator-activate-support.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- a/bindings/mono/libappindicator-api.metadata -+++ b/bindings/mono/libappindicator-api.metadata -@@ -13,6 +13,8 @@ - connection-changed - ScrollEvent - scroll-event -+ ActivateEvent -+ activate-event - NewIcon - new-icon - NewIconThemePath ---- a/src/app-indicator.c -+++ b/src/app-indicator.c -@@ -115,6 +115,7 @@ enum { - CONNECTION_CHANGED, - NEW_ICON_THEME_PATH, - SCROLL_EVENT, -+ ACTIVATE_EVENT, - LAST_SIGNAL - }; - -@@ -603,6 +604,20 @@ app_indicator_class_init (AppIndicatorCl - _application_service_marshal_VOID__INT_UINT, - G_TYPE_NONE, 2, G_TYPE_INT, GDK_TYPE_SCROLL_DIRECTION); - -+ /** -+ * AppIndicator::activate-event: -+ * @arg0: The #AppIndicator object -+ * -+ * Signaled when the #AppIndicator receives a activate event. -+ */ -+ signals[ACTIVATE_EVENT] = g_signal_new(APP_INDICATOR_SIGNAL_ACTIVATE_EVENT, -+ G_TYPE_FROM_CLASS(klass), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (AppIndicatorClass, activate_event), -+ NULL, NULL, -+ NULL, -+ G_TYPE_NONE, 0); -+ - /* DBus interfaces */ - if (item_node_info == NULL) { - GError * error = NULL; -@@ -1188,6 +1203,8 @@ bus_method_call (GDBusConnection * conne - { - gtk_widget_activate (menuitem); - } -+ } else if (g_strcmp0(method, "Activate") == 0) { -+ g_signal_emit(G_OBJECT(app), signals[ACTIVATE_EVENT], 0); - } else { - g_warning("Calling method '%s' on the app-indicator and it's unknown", method); - } -@@ -1224,6 +1241,13 @@ bus_get_prop (GDBusConnection * connecti - 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, "ToolTip") == 0) { -+ const char *title = priv->title; -+ if (!title) -+ title = g_get_application_name(); -+ if (!title) -+ title = ""; -+ return g_variant_new ("(sa(iiay)ss)", priv->icon_name, NULL, title, ""); - } else if (g_strcmp0(property, "Title") == 0) { - const gchar * output = NULL; - if (priv->title == NULL) { -@@ -1676,19 +1700,7 @@ status_icon_changes (AppIndicator * self - 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; -+ g_signal_emit(G_OBJECT(data), signals[ACTIVATE_EVENT], 0); - } - - /* Handles the right-click action by the status icon by showing ---- a/src/app-indicator.h -+++ b/src/app-indicator.h -@@ -119,6 +119,7 @@ G_BEGIN_DECLS - #define APP_INDICATOR_SIGNAL_CONNECTION_CHANGED "connection-changed" - #define APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH "new-icon-theme-path" - #define APP_INDICATOR_SIGNAL_SCROLL_EVENT "scroll-event" -+#define APP_INDICATOR_SIGNAL_ACTIVATE_EVENT "activate-event" - - /** - * AppIndicatorCategory: -@@ -228,7 +229,7 @@ struct _AppIndicatorClass { - void (*app_indicator_reserved_3)(void); - void (*app_indicator_reserved_4)(void); - void (*app_indicator_reserved_5)(void); -- void (*app_indicator_reserved_6)(void); -+ void (*activate_event)(AppIndicator *indicator, gpointer user_data); - }; - - /** ---- a/src/notification-item.xml -+++ b/src/notification-item.xml -@@ -9,6 +9,7 @@ - - - -+ - - - -+ -+ -+ -+ - - - diff --git a/libappindicator.changes b/libappindicator.changes index 926c879..87a64c4 100644 --- a/libappindicator.changes +++ b/libappindicator.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 15 14:40:16 UTC 2019 - Maurizio Galli + +- Drop libappindicator-activate-support.patch as it's no longer needed and + breaks context menu / actions in fall-back mode (boo#1132659) + ------------------------------------------------------------------- Sun Jan 13 19:146:00 UTC 2019 - ximi.obs@gmail.com diff --git a/libappindicator.spec b/libappindicator.spec index e5822df..5d8497e 100644 --- a/libappindicator.spec +++ b/libappindicator.spec @@ -32,8 +32,6 @@ URL: https://launchpad.net/libappindicator Source: https://launchpad.net/ubuntu/+archive/primary/+files/%{name}_%{_version}.orig.tar.gz # PATCH-FIX-UPSTREAM 0001_Fix_mono_dir.patch hrvoje.senjan@gmail.com -- Fix location of .pc files. Patch0: 0001_Fix_mono_dir.patch -# PATCH-FIX-OPENSUSE libappindicator-activate-support.patch yyc1992@gmail.com -- Send "activate-event" signal on the left-click action. -Patch1: libappindicator-activate-support.patch # PATCH-FIX=UPSTREAM libappindicator-no-Werror.patch dimstar@opensuse.org -- Don't add -Werror on build: the code is aging and does not keep up Patch2: libappindicator-no-Werror.patch BuildRequires: fdupes @@ -157,7 +155,6 @@ This package contains the development files for the appindicator-sharp library. %prep %setup -q -c %patch0 -p1 -%patch1 -p1 %patch2 -p1 %build