diff options
author | Edinaldo P. Silva <edps.mundognu@gmail.com> | 2023-02-06 20:40:43 +0000 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-02-11 09:30:33 +0700 |
commit | 58ff4821bb47bd13ed12f726f984f31146d6464f (patch) | |
tree | 572b781e1a06e6243a9723827f92296f682cd2c9 /desktop/openbox-menu/openbox-menu-0.8.1-gtk3.patch | |
parent | 5e371571ea94e10721a880675f23094c30028fed (diff) | |
download | slackbuilds-58ff4821bb47bd13ed12f726f984f31146d6464f.tar.gz slackbuilds-58ff4821bb47bd13ed12f726f984f31146d6464f.tar.xz |
desktop/openbox-menu: Updated for version 0.8.1.
Signed-off-by: bedlam <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'desktop/openbox-menu/openbox-menu-0.8.1-gtk3.patch')
-rw-r--r-- | desktop/openbox-menu/openbox-menu-0.8.1-gtk3.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/desktop/openbox-menu/openbox-menu-0.8.1-gtk3.patch b/desktop/openbox-menu/openbox-menu-0.8.1-gtk3.patch new file mode 100644 index 0000000000..de8e28189a --- /dev/null +++ b/desktop/openbox-menu/openbox-menu-0.8.1-gtk3.patch @@ -0,0 +1,77 @@ +From 8fe1e7fa9239ed8b604a59ef2202f183f1f56eb6 Mon Sep 17 00:00:00 2001 +From: Fabrice THIROUX <fabrice.thiroux@net-c.com> +Date: Sat, 13 Feb 2021 14:46:53 +0100 +Subject: [PATCH] Updated for gtk3. Remove icon_theme annoying variable + +--- +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ +-LIBS= `pkg-config --libs glib-2.0 gtk+-2.0 libmenu-cache` +-CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-2.0 libmenu-cache` ++LIBS= `pkg-config --libs glib-2.0 gtk+-3.0 libmenu-cache` ++CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-3.0 libmenu-cache` + CC=gcc + #-DG_DISABLE_DEPRECATED + +--- a/src/menu.c ++++ b/src/menu.c +@@ -240,7 +240,6 @@ main (int argc, char **argv) + + #ifdef WITH_ICONS + gtk_init (&argc, &argv); +- icon_theme = gtk_icon_theme_get_default (); + #endif + + if ((ob_context = configure (argc, argv)) == NULL) +--- a/src/openbox-menu.h ++++ b/src/openbox-menu.h +@@ -19,6 +19,7 @@ + + #ifndef __OPENBOXMENU_APP__ + #define __OPENBOXMENU_APP__ ++ + #include <menu-cache.h> + + #ifdef WITH_ICONS +--- a/src/utils.c ++++ b/src/utils.c +@@ -169,8 +169,6 @@ clean_exec (MenuCacheApp *app) + + #if WITH_ICONS + +-extern GtkIconTheme *icon_theme; +- + /****f* utils/item_icon_path + * OUTPUT + * return the path for the themed icon if item. +@@ -199,23 +197,21 @@ item_icon_path (MenuCacheItem *item) + if (g_path_is_absolute (name)) + return g_strdup (name); + +- /* We remove the file extension as gtk_icon_theme_lookup_icon can't +- * lookup a theme icon for, ie, 'geany.png'. It has to be 'geany'. +- */ +- tmp_name = strndup (name, strrchr (name, '.') - name); + #ifdef WITH_SVG +- icon_info = gtk_icon_theme_lookup_icon (icon_theme, tmp_name, 16, GTK_ICON_LOOKUP_GENERIC_FALLBACK); ++ icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default(), name, 16, GTK_ICON_LOOKUP_GENERIC_FALLBACK); + #else +- icon_info = gtk_icon_theme_lookup_icon (icon_theme, tmp_name, 16, GTK_ICON_LOOKUP_NO_SVG | GTK_ICON_LOOKUP_GENERIC_FALLBACK); ++ icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default(), name, 16, GTK_ICON_LOOKUP_NO_SVG | GTK_ICON_LOOKUP_GENERIC_FALLBACK); + #endif + g_free (tmp_name); + } + ++ ++ + if (!icon_info) /* 2nd fallback */ +- icon_info = gtk_icon_theme_lookup_icon (icon_theme, "empty", 16, GTK_ICON_LOOKUP_NO_SVG); ++ icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), "empty", 16, GTK_ICON_LOOKUP_NO_SVG); + + icon = g_strdup (gtk_icon_info_get_filename (icon_info)); +- gtk_icon_info_free (icon_info); ++ g_object_unref (icon_info); + + return icon; + } |