diff --git a/.gitignore b/.gitignore index 056fb11..b4c95ed 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /network-manager-applet-1.26.0.tar.xz /network-manager-applet-1.28.0.tar.xz /network-manager-applet-1.30.0.tar.xz +/network-manager-applet-1.32.0.tar.xz diff --git a/0002-appindicator-outside-X11.patch b/0002-appindicator-outside-X11.patch deleted file mode 100644 index 031be78..0000000 --- a/0002-appindicator-outside-X11.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d0d7319228ea038860c055422960ef4ac490c01b Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Thu, 16 Feb 2023 14:16:09 +0100 -Subject: [PATCH] applet: use appindicator if we can outside of X11 - -The XEmbed-based GtkStatusIcon will silently do nothing in many -environments nowadays. In particular, it can't work outside X11. - -Let's prefer X11 only if we got no app indicator support. Otherwise, use -the best backend possible and then turn on indicator support if it was -not X11. - -Based on work by Aleksei Bavshin . - -https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/129 ---- - src/applet.c | 9 +++++++++ - src/main.c | 8 ++++++-- - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/applet.c b/src/applet.c -index 5c968ffe..8ef6833a 100644 ---- a/src/applet.c -+++ b/src/applet.c -@@ -3392,6 +3392,15 @@ static void nma_init (NMApplet *applet) - { - applet->icon_size = 16; - -+#ifdef WITH_APPINDICATOR -+#ifdef GDK_WINDOWING_X11 -+ if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ())) -+ with_appindicator = TRUE; -+#else -+ with_appindicator = TRUE; -+#endif -+#endif -+ - g_signal_connect (applet, "startup", G_CALLBACK (applet_startup), NULL); - g_signal_connect (applet, "activate", G_CALLBACK (applet_activate), NULL); - } -diff --git a/src/main.c b/src/main.c -index 1c0f7e94..769ead4d 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -58,8 +58,12 @@ int main (int argc, char *argv[]) - - bindtextdomain (GETTEXT_PACKAGE, NMALOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -- if (!with_appindicator) -- gdk_set_allowed_backends ("x11,*"); -+#ifndef WITH_APPINDICATOR -+ /* If we got no app indicator, out only chance of doing anything -+ * useful is the XEmbed-based GtkStatusIcon, which only works on -+ * X11. Prefer it. */ -+ gdk_set_allowed_backends ("x11,*"); -+#endif - gtk_init (&argc, &argv); - textdomain (GETTEXT_PACKAGE); - --- -GitLab - diff --git a/sources b/sources index e8756c7..f15fca1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-manager-applet-1.30.0.tar.xz) = 2c0acf1942c0d238b28a2d9d39f8741f376dd16defefc776852c63f79c2e8e01974c3a485dc6382d5a239b8308eb12bb668f1c327ef27e7fc228d1ad03498b7d +SHA512 (network-manager-applet-1.32.0.tar.xz) = a7abe55c88fa95406e62fb442c068f95325fca748438aa037e0bd5b23add6454c3bc27ac54afe520746d32845bc7403f228f9bfde8e70c7442c906a8227ebe6c