--- a/pidgin/gtkmenutray.c Fri Nov 15 20:52:07 2019 -0600
+++ b/pidgin/gtkmenutray.c Fri Nov 15 21:19:10 2019 -0600
@@ -65,7 +65,7 @@
pidgin_menu_tray_get_property(GObject *obj, guint param_id, GValue *value,
PidginMenuTray *menu_tray = PIDGIN_MENU_TRAY(obj);
@@ -80,16 +80,14 @@
-pidgin_menu_tray_map(GtkWidget *widget)
+pidgin_menu_tray_map(GtkWidget *widget) { GTK_WIDGET_CLASS(pidgin_menu_tray_parent_class)->map(widget);
- gtk_container_add(GTK_CONTAINER(widget),
- PIDGIN_MENU_TRAY(widget)->tray);
+ gtk_container_add(GTK_CONTAINER(widget), PIDGIN_MENU_TRAY(widget)->tray); -pidgin_menu_tray_finalize(GObject *obj)
+pidgin_menu_tray_finalize(GObject *obj) { PidginMenuTray *tray = PIDGIN_MENU_TRAY(obj);
@@ -139,8 +137,9 @@
gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE);
G_GNUC_END_IGNORE_DEPRECATIONS
- if(!GTK_IS_WIDGET(menu_tray->tray))
+ if(!GTK_IS_WIDGET(menu_tray->tray)) { menu_tray->tray = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_settings_get_for_screen(gtk_widget_get_screen(widget));
@@ -165,6 +164,7 @@
pidgin_menu_tray_get_box(PidginMenuTray *menu_tray) {
g_return_val_if_fail(PIDGIN_IS_MENU_TRAY(menu_tray), NULL);
@@ -175,8 +175,7 @@
g_return_if_fail(PIDGIN_IS_MENU_TRAY(menu_tray));
g_return_if_fail(GTK_IS_WIDGET(widget));
- if (!gtk_widget_get_has_window(widget))
+ if (!gtk_widget_get_has_window(widget)) { event = gtk_event_box_new();
@@ -187,26 +186,30 @@
pidgin_menu_tray_set_tooltip(menu_tray, widget, tooltip);
gtk_box_pack_start(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0);
-pidgin_menu_tray_append(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
+pidgin_menu_tray_append(PidginMenuTray *menu_tray, GtkWidget *widget, pidgin_menu_tray_add(menu_tray, widget, tooltip, FALSE);
-pidgin_menu_tray_prepend(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
+pidgin_menu_tray_prepend(PidginMenuTray *menu_tray, GtkWidget *widget, pidgin_menu_tray_add(menu_tray, widget, tooltip, TRUE);
-pidgin_menu_tray_set_tooltip(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
+pidgin_menu_tray_set_tooltip(PidginMenuTray *menu_tray, GtkWidget *widget, /* Should we check whether widget is a child of menu_tray? */
@@ -217,8 +220,10 @@
* case, we want to set the tooltip on the widget's parent,
* not on the widget itself.
- if (!gtk_widget_get_has_window(widget))
+ if (!gtk_widget_get_has_window(widget)) { widget = gtk_widget_get_parent(widget);
gtk_widget_set_tooltip_text(widget, tooltip);
--- a/pidgin/gtkmenutray.h Fri Nov 15 20:52:07 2019 -0600
+++ b/pidgin/gtkmenutray.h Fri Nov 15 21:19:10 2019 -0600
@@ -64,7 +64,7 @@
* pidgin_menu_tray_append:
- * @tooltip: The tooltip for this widget (widget requires its own X-window)
+ * @tooltip: The tooltip for this widget * Appends a widget into the tray
@@ -74,7 +74,7 @@
* pidgin_menu_tray_prepend:
- * @tooltip: The tooltip for this widget (widget requires its own X-window)
+ * @tooltip: The tooltip for this widget * Prepends a widget into the tray
@@ -84,7 +84,7 @@
* pidgin_menu_tray_set_tooltip:
- * @tooltip: The tooltip to set for the widget (widget requires its own X-window)
+ * @tooltip: The tooltip to set for the widget * Set the tooltip for a widget