aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/bluetooth-applet-fix.patch20
-rw-r--r--debian/patches/disconnect-more-signals.patch18
-rw-r--r--debian/patches/fix-defaults-in-client.patch77
-rw-r--r--debian/patches/lp726678.patch17
-rw-r--r--debian/patches/series4
5 files changed, 136 insertions, 0 deletions
diff --git a/debian/patches/bluetooth-applet-fix.patch b/debian/patches/bluetooth-applet-fix.patch
new file mode 100644
index 0000000..34e0e48
--- /dev/null
+++ b/debian/patches/bluetooth-applet-fix.patch
@@ -0,0 +1,20 @@
+--- a/libdbusmenu-gtk/parser.c
++++ b/libdbusmenu-gtk/parser.c
+@@ -456,6 +456,17 @@ construct_dbusmenu_for_widget (GtkWidget
+ }
+ }
+
++ GtkWidget *submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
++ if (submenu)
++ {
++ pdata->shell = submenu;
++ g_signal_connect (G_OBJECT (submenu),
++ "child-added",
++ G_CALLBACK (child_added_cb),
++ mi);
++ g_object_add_weak_pointer(G_OBJECT(submenu), (gpointer*)&pdata->shell);
++ }
++
+ if (!g_object_get_data (G_OBJECT (widget), "gtk-empty-menu-item") && !GTK_IS_TEAROFF_MENU_ITEM (widget))
+ {
+ visible = gtk_widget_get_visible (widget);
diff --git a/debian/patches/disconnect-more-signals.patch b/debian/patches/disconnect-more-signals.patch
new file mode 100644
index 0000000..653d32c
--- /dev/null
+++ b/debian/patches/disconnect-more-signals.patch
@@ -0,0 +1,18 @@
+=== modified file 'libdbusmenu-gtk/parser.c'
+Index: libdbusmenu-0.3.99/libdbusmenu-gtk/parser.c
+===================================================================
+--- libdbusmenu-0.3.99.orig/libdbusmenu-gtk/parser.c 2011-02-28 10:09:40.907065942 -0500
++++ libdbusmenu-0.3.99/libdbusmenu-gtk/parser.c 2011-02-28 10:09:43.037065942 -0500
+@@ -129,6 +129,12 @@
+ if (pdata != NULL && pdata->widget != NULL) {
+ g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
+ 0, 0, NULL, G_CALLBACK(widget_notify_cb), NULL);
++ g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
++ 0, 0, NULL, G_CALLBACK(accel_changed), NULL);
++ g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
++ 0, 0, NULL, G_CALLBACK(checkbox_toggled), NULL);
++ g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
++ 0, 0, NULL, G_CALLBACK(menuitem_notify_cb), NULL);
+ g_object_remove_weak_pointer(G_OBJECT(pdata->widget), (gpointer*)&pdata->widget);
+ }
+
diff --git a/debian/patches/fix-defaults-in-client.patch b/debian/patches/fix-defaults-in-client.patch
new file mode 100644
index 0000000..8e422db
--- /dev/null
+++ b/debian/patches/fix-defaults-in-client.patch
@@ -0,0 +1,77 @@
+--- a/libdbusmenu-glib/menuitem.c
++++ b/libdbusmenu-glib/menuitem.c
+@@ -1150,9 +1150,9 @@ dbusmenu_menuitem_property_set_variant (
+ DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+ GVariant * default_value = NULL;
+
+- if (value != NULL) {
+- const gchar * type = menuitem_get_type(mi);
++ const gchar * type = menuitem_get_type(mi);
+
++ if (value != NULL) {
+ /* Check the expected type to see if we want to have a warning */
+ GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
+ if (default_type != NULL) {
+@@ -1163,22 +1163,23 @@ dbusmenu_menuitem_property_set_variant (
+ g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
+ }
+ }
++ }
+
+- /* Check the defaults database to see if we have a default
+- for this property. */
+- default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
+- if (default_value != NULL) {
+- /* Now see if we're setting this to the same value as the
+- default. If we are then we just want to swallow this variant
+- and make the function behave like we're clearing it. */
+- if (g_variant_equal(default_value, value)) {
+- g_variant_ref_sink(value);
+- g_variant_unref(value);
+- value = NULL;
+- }
++ /* Check the defaults database to see if we have a default
++ for this property. */
++ default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
++ if (default_value != NULL && value != NULL) {
++ /* Now see if we're setting this to the same value as the
++ default. If we are then we just want to swallow this variant
++ and make the function behave like we're clearing it. */
++ if (g_variant_equal(default_value, value)) {
++ g_variant_ref_sink(value);
++ g_variant_unref(value);
++ value = NULL;
+ }
+ }
+
++
+ gboolean replaced = FALSE;
+ gpointer currentval = g_hash_table_lookup(priv->properties, property);
+
+@@ -1371,9 +1372,7 @@ dbusmenu_menuitem_property_remove (Dbusm
+ g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
+ g_return_if_fail(property != NULL);
+
+- DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+-
+- g_hash_table_remove(priv->properties, property);
++ dbusmenu_menuitem_property_set_variant(mi, property, NULL);
+
+ return;
+ }
+@@ -1753,13 +1752,8 @@ dbusmenu_menuitem_property_is_default (D
+ return FALSE;
+ }
+
+- currentval = dbusmenu_defaults_default_get(priv->defaults, menuitem_get_type(mi), property);
+- if (currentval != NULL) {
+- return TRUE;
+- }
+-
+- g_warn_if_reached();
+- return FALSE;
++ /* If we haven't stored it locally, then it's the default */
++ return TRUE;
+ }
+
+ /* Check to see if this menu item has been sent into the bus yet or
diff --git a/debian/patches/lp726678.patch b/debian/patches/lp726678.patch
new file mode 100644
index 0000000..e784b60
--- /dev/null
+++ b/debian/patches/lp726678.patch
@@ -0,0 +1,17 @@
+=== modified file 'libdbusmenu-glib/server.c'
+--- a/libdbusmenu-glib/server.c 2011-02-24 19:52:01 +0000
++++ b/libdbusmenu-glib/server.c 2011-03-01 16:51:50 +0000
+@@ -1180,7 +1180,11 @@
+ GVariant * items = NULL;
+
+ if (priv->root != NULL) {
+- items = dbusmenu_menuitem_build_variant(priv->root, props, recurse);
++ DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, parent);
++
++ if (mi != NULL) {
++ items = dbusmenu_menuitem_build_variant(mi, props, recurse);
++ }
+ }
+
+ /* What happens if we don't have anything? */
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3467a18
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+disconnect-more-signals.patch
+fix-defaults-in-client.patch
+bluetooth-applet-fix.patch
+lp726678.patch
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-24 09:45:20 +0000