pool/libappindicator
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1178330 from X11:Unity

Browse Source 
- Drop xappstatusicon.patch: patch has not been applied since Nov
  2021.
- Drop --disable-gtk-doc configure paramter: no longer recognized. (forwarded request 1174818 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/1178330
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libappindicator?expand=0&rev=22
This commit is contained in:
Ana Guerrero 2024-06-04 10:50:24 +00:00 committed by Git OBS Bridge
commit 62f112cbd5
3 changed files with 16 additions and 557 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libappindicator.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri May 17 10:18:40 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Drop xappstatusicon.patch: patch has not been applied since Nov
2021.
- Drop --disable-gtk-doc configure paramter: no longer recognized.
-------------------------------------------------------------------
Fri Mar 1 13:33:17 UTC 2024 - pgajdos@suse.com
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Mon Oct 30 11:56:00 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

11
libappindicator.spec
View File

@ -1,7 +1,7 @@
#
# spec file
# spec file for package libappindicator
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -42,8 +42,6 @@ Source: https://launchpad.net/ubuntu/+archive/primary/+files/libappindic
Patch0: 0001_Fix_mono_dir.patch
# PATCH-FIX-OPENSUSE make_gtk_doc_optional.patch -- Do not require macros from gtk-doc
Patch1: make_gtk_doc_optional.patch
# PATCH-FIX-OPENSUSE xappstatusicon.patch maurizio.galli@gmail.com -- Original patch by Linux Mint. Include support for XAppStatusIcon by Linux Mint
Patch2: xappstatusicon.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: fdupes
@ -130,9 +128,8 @@ This package contains the development files for the appindicator%{?psuffix} libr
%prep
%setup -q -c -n libappindicator-%{version}
%patch0 -p1
%patch1 -p1
#%%patch2 -p1
%patch -P 0 -p1
%patch -P 1 -p1
%build
# Create dummy file, to avoid dependency on gtk-doc

550
xappstatusicon.patch
View File

@ -1,550 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,8 @@ AS_IF([test "x$with_gtk" = x3],
glib-2.0 >= $GLIB_REQUIRED_VERSION
gio-unix-2.0
gio-2.0 >= $GIO_REQUIRED_VERSION
- dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
+ dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+ xapp >= 1.5.0)
AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
],
[test "x$with_gtk" = x2],
--- a/src/appindicator3-0.1.pc.in
+++ b/src/appindicator3-0.1.pc.in
@@ -5,7 +5,7 @@ bindir=@bindir@
includedir=@includedir@
Cflags: -I${includedir}/libappindicator3-0.1
-Requires: dbusmenu-glib-0.4 gtk+-3.0
+Requires: dbusmenu-glib-0.4 gtk+-3.0 xapp
Libs: -L${libdir} -lappindicator3
Name: appindicator3-0.1
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -31,6 +31,8 @@ License version 3 and version 2.1 along
#include "config.h"
#endif
+#include <gdk/gdk.h>
+
#include <libdbusmenu-glib/menuitem.h>
#include <libdbusmenu-glib/server.h>
#include <libdbusmenu-gtk/client.h>
@@ -52,6 +54,8 @@ License version 3 and version 2.1 along
#define PANEL_ICON_SUFFIX "panel"
+#define FALLBACK_ICON "image-missing"
+
/**
* AppIndicatorPrivate:
* All of the private data in an instance of an application indicator.
@@ -90,7 +94,7 @@ struct _AppIndicatorPrivate {
gchar * att_accessible_desc;
guint label_change_idle;
- GtkStatusIcon * status_icon;
+ XAppStatusIcon * status_icon;
gint fallback_timer;
/* Fun stuff */
@@ -186,14 +190,11 @@ static void check_connect (AppIndicator
static void register_service_cb (GObject * obj, GAsyncResult * res, gpointer user_data);
static void start_fallback_timer (AppIndicator * self, gboolean disable_timeout);
static gboolean fallback_timer_expire (gpointer data);
-static GtkStatusIcon * fallback (AppIndicator * self);
+static XAppStatusIcon * fallback (AppIndicator * self);
static void status_icon_status_wrapper (AppIndicator * self, const gchar * status, gpointer data);
-static gboolean scroll_event_wrapper(GtkWidget *status_icon, GdkEventScroll *event, gpointer user_data);
-static gboolean middle_click_wrapper(GtkWidget *status_icon, GdkEventButton *event, gpointer user_data);
+// static gboolean scroll_event_wrapper(GtkWidget *status_icon, GdkEventScroll *event, gpointer user_data);
static void status_icon_changes (AppIndicator * self, gpointer data);
-static void status_icon_activate (GtkStatusIcon * icon, gpointer data);
-static void status_icon_menu_activate (GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data);
-static void unfallback (AppIndicator * self, GtkStatusIcon * status_icon);
+static void unfallback (AppIndicator * self, XAppStatusIcon * status_icon);
static gchar * append_panel_icon_suffix (const gchar * icon_name);
static gchar * get_real_theme_path (AppIndicator * self);
static gchar * append_snap_prefix (const gchar * path);
@@ -988,6 +989,9 @@ app_indicator_set_property (GObject * ob
if (g_strcmp0(oldlabel, priv->label) != 0) {
signal_label_change(APP_INDICATOR(object));
+ if (priv->status_icon != NULL) {
+ xapp_status_icon_set_label (priv->status_icon, priv->label ? priv->label : "");
+ }
}
if (oldlabel != NULL) {
@@ -1019,15 +1023,16 @@ app_indicator_set_property (GObject * ob
g_warning("Unable to send signal for NewTitle: %s", error->message);
g_error_free(error);
}
+
+ if (priv->status_icon != NULL) {
+ xapp_status_icon_set_tooltip_text (priv->status_icon, priv->title ? priv->title : "");
+ }
}
if (oldtitle != NULL) {
g_free(oldtitle);
}
- if (priv->status_icon != NULL) {
- gtk_status_icon_set_title(priv->status_icon, priv->title ? priv->title : "");
- }
break;
}
case PROP_LABEL_GUIDE: {
@@ -1557,19 +1562,60 @@ theme_changed_cb (GtkIconTheme * theme,
return;
}
+/* Handles the middle-click secondary action coming from XAppStatusIcon. */
+static void
+status_icon_menu_button_activate (XAppStatusIcon *status_icon,
+ guint button,
+ guint activate_time,
+ gpointer user_data)
+{
+ AppIndicator *self = APP_INDICATOR (user_data);
+
+ if (button == GDK_BUTTON_PRIMARY || button == GDK_BUTTON_MIDDLE) {
+ GtkWidget *menuitem = self->priv->sec_activate_target;
+
+ if (menuitem != NULL &&
+ gtk_widget_get_visible (menuitem) &&
+ gtk_widget_get_sensitive (menuitem))
+ {
+ gtk_widget_activate (menuitem);
+ }
+ }
+}
+
+static void
+status_icon_set_has_secondary_activate (XAppStatusIcon *icon,
+ gboolean has)
+{
+ if (icon != NULL)
+ {
+ g_object_set_data (G_OBJECT (icon),
+ "app-indicator-has-secondary-activate", GINT_TO_POINTER (has));
+ }
+}
+
/* Creates a StatusIcon that can be used when the application
indicator area isn't available. */
-static GtkStatusIcon *
+static XAppStatusIcon *
fallback (AppIndicator * self)
{
- GtkStatusIcon * icon = gtk_status_icon_new();
+ XAppStatusIcon * icon = xapp_status_icon_new();
+
+ xapp_status_icon_set_name(icon, app_indicator_get_id(self));
- gtk_status_icon_set_name(icon, app_indicator_get_id(self));
const gchar * title = app_indicator_get_title(self);
if (title != NULL) {
- gtk_status_icon_set_title(icon, title);
+ xapp_status_icon_set_tooltip_text (icon, title);
}
+ xapp_status_icon_set_label (icon, app_indicator_get_label (self));
+
+ /* Tell xapp-status-icon where this is coming from. It will change the behavior
+ * of left clicks accordingly (to open the menu instead of some sort of 'activation') */
+ g_object_set_data (G_OBJECT (icon), "app-indicator", GINT_TO_POINTER (1));
+
+ status_icon_set_has_secondary_activate (icon, self->priv->sec_activate_enabled);
+
g_signal_connect(G_OBJECT(self), APP_INDICATOR_SIGNAL_NEW_STATUS,
G_CALLBACK(status_icon_status_wrapper), icon);
g_signal_connect(G_OBJECT(self), APP_INDICATOR_SIGNAL_NEW_ICON,
@@ -1577,12 +1623,11 @@ fallback (AppIndicator * self)
g_signal_connect(G_OBJECT(self), APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON,
G_CALLBACK(status_icon_changes), icon);
+ xapp_status_icon_set_secondary_menu (icon, app_indicator_get_menu (self));
+
status_icon_changes(self, icon);
- g_signal_connect(G_OBJECT(icon), "activate", G_CALLBACK(status_icon_activate), self);
- g_signal_connect(G_OBJECT(icon), "popup-menu", G_CALLBACK(status_icon_menu_activate), self);
- g_signal_connect(G_OBJECT(icon), "scroll-event", G_CALLBACK(scroll_event_wrapper), self);
- g_signal_connect(G_OBJECT(icon), "button-release-event", G_CALLBACK(middle_click_wrapper), self);
+ g_signal_connect(G_OBJECT(icon), "activate", G_CALLBACK(status_icon_menu_button_activate), self);
return icon;
}
@@ -1597,49 +1642,22 @@ status_icon_status_wrapper (AppIndicator
/* A wrapper for redirecting the scroll events to the app-indicator from status
icon widget. */
-static gboolean
-scroll_event_wrapper (GtkWidget *status_icon, GdkEventScroll *event, gpointer data)
-{
- g_return_val_if_fail(IS_APP_INDICATOR(data), FALSE);
- AppIndicator * app = APP_INDICATOR(data);
- g_signal_emit(app, signals[SCROLL_EVENT], 0, 1, event->direction);
-
- return TRUE;
-}
+// static gboolean
+// scroll_event_wrapper (GtkWidget *status_icon, GdkEventScroll *event, gpointer data)
+// {
+// g_return_val_if_fail(IS_APP_INDICATOR(data), FALSE);
+// AppIndicator * app = APP_INDICATOR(data);
+// g_signal_emit(app, signals[SCROLL_EVENT], 0, 1, event->direction);
-static gboolean
-middle_click_wrapper (GtkWidget *status_icon, GdkEventButton *event, gpointer data)
-{
- g_return_val_if_fail(IS_APP_INDICATOR(data), FALSE);
- AppIndicator * app = APP_INDICATOR(data);
- AppIndicatorPrivate *priv = app->priv;
-
- if (event->button == 2 && event->type == GDK_BUTTON_RELEASE) {
- GtkAllocation alloc;
- gint px = event->x;
- gint py = event->y;
- gtk_widget_get_allocation (status_icon, &alloc);
- GtkWidget *menuitem = priv->sec_activate_target;
-
- if (px >= 0 && px < alloc.width && py >= 0 && py < alloc.height &&
- priv->sec_activate_enabled && menuitem &&
- gtk_widget_get_visible (menuitem) &&
- gtk_widget_get_sensitive (menuitem))
- {
- gtk_widget_activate (menuitem);
- return TRUE;
- }
- }
-
- return FALSE;
-}
+// return TRUE;
+// }
/* This tracks changes to either the status or the icons
that are associated with the app indicator */
static void
status_icon_changes (AppIndicator * self, gpointer data)
{
- GtkStatusIcon * icon = GTK_STATUS_ICON(data);
+ XAppStatusIcon * icon = XAPP_STATUS_ICON(data);
/* add the icon_theme_path once if needed */
GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
@@ -1668,17 +1686,17 @@ status_icon_changes (AppIndicator * self
switch (app_indicator_get_status(self)) {
case APP_INDICATOR_STATUS_PASSIVE:
/* hide first to avoid that the change is visible to the user */
- gtk_status_icon_set_visible(icon, FALSE);
+ xapp_status_icon_set_visible(icon, FALSE);
icon_name = app_indicator_get_icon(self);
break;
case APP_INDICATOR_STATUS_ACTIVE:
icon_name = app_indicator_get_icon(self);
- gtk_status_icon_set_visible(icon, TRUE);
+ xapp_status_icon_set_visible(icon, TRUE);
break;
case APP_INDICATOR_STATUS_ATTENTION:
/* get the _attention_ icon here */
icon_name = app_indicator_get_attention_icon(self);
- gtk_status_icon_set_visible(icon, TRUE);
+ xapp_status_icon_set_visible(icon, TRUE);
break;
};
@@ -1686,16 +1704,45 @@ status_icon_changes (AppIndicator * self
gchar *snapped_icon = append_snap_prefix(icon_name);
if (g_file_test(icon_name, G_FILE_TEST_EXISTS)) {
- gtk_status_icon_set_from_file(icon, icon_name);
+ xapp_status_icon_set_icon_name(icon, icon_name);
} else if (snapped_icon && g_file_test(snapped_icon, G_FILE_TEST_EXISTS)) {
- gtk_status_icon_set_from_file(icon, snapped_icon);
+ xapp_status_icon_set_icon_name(icon, snapped_icon);
} else {
gchar *longname = append_panel_icon_suffix(icon_name);
if (longname != NULL && gtk_icon_theme_has_icon (icon_theme, longname)) {
- gtk_status_icon_set_from_icon_name(icon, longname);
+ xapp_status_icon_set_icon_name(icon, longname);
} else {
- gtk_status_icon_set_from_icon_name(icon, icon_name);
+ if (gtk_icon_theme_has_icon (icon_theme, icon_name)) {
+ xapp_status_icon_set_icon_name(icon, icon_name);
+ } else {
+ gint i;
+ gchar *icon_path;
+
+ const gchar *extensions[] = {
+ "png",
+ "svg",
+ };
+
+ for (i = 0; i < G_N_ELEMENTS (extensions); i++) {
+ icon_path = g_strdup_printf ("%s/%s.%s", theme_path, icon_name, extensions[i]);
+
+ if (g_file_test (icon_path, G_FILE_TEST_EXISTS)) {
+ break;
+ }
+
+ g_clear_pointer (&icon_path, g_free);
+ }
+
+ if (icon_path) {
+ xapp_status_icon_set_icon_name (icon, icon_path);
+ g_free (icon_path);
+ } else {
+ // Should we do this?? Otherwise there's a blank (but reactive)
+ // space in the panel
+ xapp_status_icon_set_icon_name (icon, FALLBACK_ICON);
+ }
+ }
}
g_free(longname);
@@ -1707,44 +1754,16 @@ status_icon_changes (AppIndicator * self
return;
}
-/* Handles the activate action by the status icon by showing
- the menu in a popup. */
-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;
-}
-
-/* Handles the right-click action by the status icon by showing
- the menu in a popup. */
-static void
-status_icon_menu_activate (GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data)
-{
- status_icon_activate(status_icon, user_data);
-}
-
/* Removes the status icon as the application indicator area
is now up and running again. */
static void
-unfallback (AppIndicator * self, GtkStatusIcon * status_icon)
+unfallback (AppIndicator * self, XAppStatusIcon * status_icon)
{
g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_status_wrapper, status_icon);
g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_changes, status_icon);
- g_signal_handlers_disconnect_by_func(G_OBJECT(self), scroll_event_wrapper, status_icon);
- g_signal_handlers_disconnect_by_func(G_OBJECT(self), middle_click_wrapper, status_icon);
- gtk_status_icon_set_visible(status_icon, FALSE);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_menu_button_activate, status_icon);
+
+ xapp_status_icon_set_visible(status_icon, FALSE);
g_object_unref(G_OBJECT(status_icon));
return;
}
@@ -1796,6 +1815,8 @@ sec_activate_target_parent_changed(GtkWi
g_return_if_fail(IS_APP_INDICATOR(data));
AppIndicator *self = data;
self->priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
+
+ status_icon_set_has_secondary_activate (self->priv->status_icon, self->priv->sec_activate_enabled);
}
@@ -2089,6 +2110,7 @@ app_indicator_set_label (AppIndicator *s
PROP_LABEL_GUIDE_S, guide == NULL ? "" : guide,
NULL);
+
return;
}
@@ -2260,9 +2282,14 @@ app_indicator_set_menu (AppIndicator *se
priv->menu = GTK_WIDGET (menu);
g_object_ref_sink (priv->menu);
+ if (self->priv->status_icon) {
+ xapp_status_icon_set_secondary_menu (self->priv->status_icon, menu);
+ }
+
setup_dbusmenu (self);
priv->sec_activate_enabled = widget_is_menu_child (self, priv->sec_activate_target);
+ status_icon_set_has_secondary_activate (self->priv->status_icon, priv->sec_activate_enabled);
check_connect (self);
@@ -2316,6 +2343,7 @@ app_indicator_set_secondary_activate_tar
self);
g_object_unref(G_OBJECT(priv->sec_activate_target));
priv->sec_activate_target = NULL;
+ status_icon_set_has_secondary_activate (priv->status_icon, FALSE);
}
if (menuitem == NULL) {
@@ -2326,6 +2354,7 @@ app_indicator_set_secondary_activate_tar
priv->sec_activate_target = g_object_ref(menuitem);
priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
+ status_icon_set_has_secondary_activate (priv->status_icon, priv->sec_activate_enabled);
g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self);
}
--- a/src/app-indicator.h
+++ b/src/app-indicator.h
@@ -32,6 +32,14 @@ License version 3 and version 2.1 along
#include <gtk/gtk.h>
+#if GTK_MAJOR_VERSION == 3
+#define USE_XAPP_FALLBACK 1
+#endif
+
+#ifdef USE_XAPP_FALLBACK
+#include <libxapp/xapp-status-icon.h>
+#endif
+
G_BEGIN_DECLS
/**
@@ -218,10 +226,18 @@ struct _AppIndicatorClass {
void (*app_indicator_reserved_ats)(void);
/* Overridable Functions */
+#ifdef USE_XAPP_FALLBACK
+ XAppStatusIcon * (*fallback) (AppIndicator * indicator);
+ void (*unfallback) (AppIndicator * indicator,
+ XAppStatusIcon * status_icon);
+
+#else
GtkStatusIcon * (*fallback) (AppIndicator * indicator);
void (*unfallback) (AppIndicator * indicator,
GtkStatusIcon * status_icon);
+#endif
+
/* Reserved */
void (*app_indicator_reserved_1)(void);
void (*app_indicator_reserved_2)(void);
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,6 @@ libappindicatorinclude_HEADERS = \
libappindicator_la_SOURCES = \
$(libappindicator_headers) \
app-indicator-enum-types.c \
- app-indicator.c \
application-service-marshal.c \
dbus-shared.h \
generate-id.h \
@@ -69,6 +68,14 @@ libappindicator_la_SOURCES = \
gen-notification-watcher.xml.h \
gen-notification-watcher.xml.c
+if USE_GTK3
+libappindicator_la_SOURCES += \
+ app-indicator.c
+else
+libappindicator_la_SOURCES += \
+ app-indicator-gtk2.c
+endif
+
libappindicator_la_LDFLAGS = \
$(COVERAGE_LDFLAGS) \
-version-info 1:0:0 \
@@ -151,9 +158,15 @@ INTROSPECTION_COMPILER_ARGS = --included
if HAVE_INTROSPECTION
+if USE_GTK3
introspection_sources = \
$(addprefix $(srcdir)/,app-indicator.c) \
$(addprefix $(srcdir)/,$(libappindicator_headers))
+else
+introspection_sources = \
+ $(addprefix $(srcdir)/,app-indicator-gtk2.c) \
+ $(addprefix $(srcdir)/,$(libappindicator_headers))
+endif
AppIndicator3-0.1.gir: libappindicator3.la
--- a/tests/test-libappindicator-fallback-item.c
+++ b/tests/test-libappindicator-fallback-item.c
@@ -31,8 +31,14 @@ GType test_libappindicator_fallback_item
static void test_libappindicator_fallback_item_class_init (TestLibappindicatorFallbackItemClass *klass);
static void test_libappindicator_fallback_item_init (TestLibappindicatorFallbackItem *self);
+
+#ifdef USE_XAPP_FALLBACK
+static XAppStatusIcon * fallback (AppIndicator * indicator);
+static void unfallback (AppIndicator * indicator, XAppStatusIcon * status_icon);
+#else
static GtkStatusIcon * fallback (AppIndicator * indicator);
static void unfallback (AppIndicator * indicator, GtkStatusIcon * status_icon);
+#endif
G_DEFINE_TYPE (TestLibappindicatorFallbackItem, test_libappindicator_fallback_item, APP_INDICATOR_TYPE);
@@ -63,6 +69,39 @@ enum {
gint state = STATE_INIT;
+#ifdef USE_XAPP_FALLBACK
+static XAppStatusIcon *
+fallback (AppIndicator * indicator)
+{
+ g_debug("Fallback");
+ if (state == STATE_INIT) {
+ state = STATE_FALLBACK;
+ } else if (state == STATE_UNFALLBACK) {
+ state = STATE_REFALLBACK;
+ } else {
+ g_debug("Error, fallback in state: %d", state);
+ passed = FALSE;
+ }
+ return (XAppStatusIcon *)5;
+}
+
+static void
+unfallback (AppIndicator * indicator, XAppStatusIcon * status_icon)
+{
+ g_debug("Unfallback");
+ if (state == STATE_FALLBACK) {
+ state = STATE_UNFALLBACK;
+ } else if (state == STATE_REFALLBACK) {
+ state = STATE_REUNFALLBACK;
+ passed = TRUE;
+ g_main_loop_quit(mainloop);
+ } else {
+ g_debug("Error, unfallback in state: %d", state);
+ passed = FALSE;
+ }
+ return;
+}
+#else
static GtkStatusIcon *
fallback (AppIndicator * indicator)
{
@@ -94,6 +133,7 @@ unfallback (AppIndicator * indicator, Gt
}
return;
}
+#endif // USE_XAPP_FALLBACK
gboolean
kill_func (gpointer data)