Mercurial > pidgin3 / changeset

--- a/pidgin/gtkblist.c	Fri Nov 15 21:53:45 2019 -0600
+++ b/pidgin/gtkblist.c	Mon Nov 18 21:02:18 2019 -0600
@@ -44,7 +44,6 @@
 #include "gtkconv.h"
 #include "gtkdialogs.h"
 #include "gtkxfer.h"
-#include "gtkmenutray.h"
 #include "gtkpounce.h"
 #include "gtkplugin.h"
 #include "gtkprefs.h"
@@ -65,6 +64,7 @@
 #include "pidgin/pidgingdkpixbuf.h"
 #include "pidgin/pidginlog.h"
 #include "pidgin/pidgintooltip.h"
+#include "pidginmenutray.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>

--- a/pidgin/gtkconv.c	Fri Nov 15 21:53:45 2019 -0600
+++ b/pidgin/gtkconv.c	Mon Nov 18 21:02:18 2019 -0600
@@ -54,7 +54,6 @@
 #include "gtkconv.h"
 #include "gtkconvwin.h"
 #include "gtkdialogs.h"
-#include "gtkmenutray.h"
 #include "gtkpounce.h"
 #include "gtkprefs.h"
 #include "gtkprivacy.h"
@@ -63,6 +62,7 @@
 #include "pidgingdkpixbuf.h"
 #include "pidgininvitedialog.h"
 #include "pidginlog.h"
+#include "pidginmenutray.h"
 #include "pidginmessage.h"
 #include "pidginstock.h"
 #include "pidgintooltip.h"
@@ -6962,11 +6962,11 @@
 #include "gtkblist.h"
 #include "gtkconv.h"
 #include "gtkdialogs.h"
-#include "gtkmenutray.h"
 #include "gtkpounce.h"
 #include "gtkprefs.h"
 #include "gtkprivacy.h"
 #include "gtkutils.h"
+#include "pidginmenutray.h"
 #include "pidginstock.h"
 
 static void

--- a/pidgin/gtkmenutray.c	Fri Nov 15 21:53:45 2019 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-/*
- * Pidgin is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-#include "internal.h"
-
-#include "debug.h"
-
-#include "gtkmenutray.h"
-
-struct _PidginMenuTray {
-	GtkMenuItem parent;
-
-	GtkWidget *tray;
-};
-
-enum {
-	PROP_ZERO = 0,
-	PROP_BOX,
-	N_PROPERTIES
-};
-
-/******************************************************************************
- * Globals
- *****************************************************************************/
-static GParamSpec *properties[N_PROPERTIES] = {NULL, };
-
-/******************************************************************************
- * Item Stuff
- *****************************************************************************/
-static void
-pidgin_menu_tray_select(GtkMenuItem *widget) {
-	/* this may look like nothing, but it's really overriding the
-	 * GtkMenuItem's select function so that it doesn't get highlighted like
-	 * a normal menu item would.
-	 */
-}
-
-static void
-pidgin_menu_tray_deselect(GtkMenuItem *widget) {
-	/* Probably not necessary, but I'd rather be safe than sorry.  We're
-	 * overridding the select, so it makes sense to override deselect as well.
-	 */
-}
-
-/******************************************************************************
- * GObject Implementation
- *****************************************************************************/
-G_DEFINE_TYPE(PidginMenuTray, pidgin_menu_tray, GTK_TYPE_MENU_ITEM);
-
-static void
-pidgin_menu_tray_get_property(GObject *obj, guint param_id, GValue *value,
-                              GParamSpec *pspec)
-{
-	PidginMenuTray *menu_tray = PIDGIN_MENU_TRAY(obj);
-
-	switch(param_id) {
-		case PROP_BOX:
-			g_value_set_object(value, pidgin_menu_tray_get_box(menu_tray));
-			break;
-		default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec);
-			break;
-	}
-}
-
-static void
-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);
-}
-
-static void
-pidgin_menu_tray_class_init(PidginMenuTrayClass *klass) {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-	GtkMenuItemClass *menu_item_class = GTK_MENU_ITEM_CLASS(klass);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
-
-	obj_class->get_property = pidgin_menu_tray_get_property;
-
-	menu_item_class->select = pidgin_menu_tray_select;
-	menu_item_class->deselect = pidgin_menu_tray_deselect;
-
-	widget_class->map = pidgin_menu_tray_map;
-
-	properties[PROP_BOX] = g_param_spec_object("box", "The box", "The box",
-	                                           GTK_TYPE_BOX,
-	                                           G_PARAM_READABLE);
-
-	g_object_class_install_properties(obj_class, N_PROPERTIES, properties);
-}
-
-static void
-pidgin_menu_tray_init(PidginMenuTray *menu_tray) {
-	GtkWidget *widget = GTK_WIDGET(menu_tray);
-	gint height = -1;
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-	/* Gtk3 docs says, it should be replaced with gtk_widget_set_hexpand and
-	 * gtk_widget_set_halign. But it doesn't seems to work. */
-	gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE);
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-	if(!GTK_IS_WIDGET(menu_tray->tray)) {
-		menu_tray->tray = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-	}
-
-	if(gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, NULL, &height)) {
-		gtk_widget_set_size_request(widget, -1, height);
-	}
-
-	gtk_widget_show(menu_tray->tray);
-}
-
-/******************************************************************************
- * API
- *****************************************************************************/
-GtkWidget *
-pidgin_menu_tray_new() {
-	return g_object_new(PIDGIN_TYPE_MENU_TRAY, NULL);
-}
-
-GtkWidget *
-pidgin_menu_tray_get_box(PidginMenuTray *menu_tray) {
-	g_return_val_if_fail(PIDGIN_IS_MENU_TRAY(menu_tray), NULL);
-
-	return menu_tray->tray;
-}
-
-static void
-pidgin_menu_tray_add(PidginMenuTray *menu_tray, GtkWidget *widget,
-					   const char *tooltip, gboolean prepend)
-{
-	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)) {
-		GtkWidget *event;
-
-		event = gtk_event_box_new();
-		gtk_container_add(GTK_CONTAINER(event), widget);
-		gtk_widget_show(event);
-		widget = event;
-	}
-
-	pidgin_menu_tray_set_tooltip(menu_tray, widget, tooltip);
-
-	if (prepend) {
-		gtk_box_pack_start(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0);
-	} else {
-		gtk_box_pack_end(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0);
-	}
-}
-
-void
-pidgin_menu_tray_append(PidginMenuTray *menu_tray, GtkWidget *widget,
-                        const char *tooltip)
-{
-	pidgin_menu_tray_add(menu_tray, widget, tooltip, FALSE);
-}
-
-void
-pidgin_menu_tray_prepend(PidginMenuTray *menu_tray, GtkWidget *widget,
-                         const char *tooltip)
-{
-	pidgin_menu_tray_add(menu_tray, widget, tooltip, TRUE);
-}
-
-void
-pidgin_menu_tray_set_tooltip(PidginMenuTray *menu_tray, GtkWidget *widget,
-                             const char *tooltip)
-{
-	/* Should we check whether widget is a child of menu_tray? */
-
-	/*
-	 * If the widget does not have its own window, then it
-	 * must have automatically been added to an event box
-	 * when it was added to the menu tray.  If this is the
-	 * case, we want to set the tooltip on the widget's parent,
-	 * not on the widget itself.
-	 */
-	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 21:53:45 2019 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/* Pidgin is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-
-#ifndef PIDGIN_MENU_TRAY_H
-#define PIDGIN_MENU_TRAY_H
-
-/**
- * SECTION:gtkmenutray
- * @section_id: pidgin-gtkmenutray
- * @short_description: <filename>gtkmenutray.h</filename>
- * @title: Tray Menu Item
- */
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define PIDGIN_TYPE_MENU_TRAY (pidgin_menu_tray_get_type())
-G_DECLARE_FINAL_TYPE(PidginMenuTray, pidgin_menu_tray, PIDGIN, MENU_TRAY, GtkMenuItem)
-
-/**
- * PidginMenuTray:
- *
- * A PidginMenuTray is a #GtkMenuItem that allows you to pack icons into it
- * similar to a system notification area but in a windows menu bar.
- */
-
-/**
- * pidgin_menu_tray_new:
- *
- * Creates a new PidginMenuTray
- *
- * Returns: A new PidginMenuTray
- */
-GtkWidget *pidgin_menu_tray_new(void);
-
-/**
- * pidgin_menu_tray_get_box:
- * @menu_tray: The PidginMenuTray
- *
- * Gets the box for the PidginMenuTray
- *
- * Returns: (transfer none): The box that this menu tray is using
- */
-GtkWidget *pidgin_menu_tray_get_box(PidginMenuTray *menu_tray);
-
-/**
- * pidgin_menu_tray_append:
- * @menu_tray: The tray
- * @widget:    The widget
- * @tooltip:   The tooltip for this widget
- *
- * Appends a widget into the tray
- */
-void pidgin_menu_tray_append(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip);
-
-/**
- * pidgin_menu_tray_prepend:
- * @menu_tray: The tray
- * @widget:    The widget
- * @tooltip:   The tooltip for this widget
- *
- * Prepends a widget into the tray
- */
-void pidgin_menu_tray_prepend(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip);
-
-/**
- * pidgin_menu_tray_set_tooltip:
- * @menu_tray: The tray
- * @widget:    The widget
- * @tooltip:   The tooltip to set for the widget
- *
- * Set the tooltip for a widget
- */
-void pidgin_menu_tray_set_tooltip(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip);
-
-G_END_DECLS
-
-#endif /* PIDGIN_MENU_TRAY_H */

--- a/pidgin/meson.build	Fri Nov 15 21:53:45 2019 -0600
+++ b/pidgin/meson.build	Mon Nov 18 21:02:18 2019 -0600
@@ -14,7 +14,6 @@
 	'gtkicon-theme-loader.c',
 	'gtkidle.c',
 	'gtkmedia.c',
-	'gtkmenutray.c',
 	'gtknotify.c',
 	'gtkplugin.c',
 	'gtkpluginpref.c',
@@ -44,6 +43,7 @@
 	'pidgingdkpixbuf.c',
 	'pidgininvitedialog.c',
 	'pidginlog.c',
+	'pidginmenutray.c',
 	'pidginmessage.c',
 	'pidgintalkatu.c',
 	'pidgintooltip.c',
@@ -65,7 +65,6 @@
 	'gtkicon-theme-loader.h',
 	'gtkidle.h',
 	'gtkmedia.h',
-	'gtkmenutray.h',
 	'gtknickcolors.h',
 	'gtknotify.h',
 	'gtkplugin.h',
@@ -97,6 +96,7 @@
 	'pidginicon.h',
 	'pidgininvitedialog.h',
 	'pidginlog.h',
+	'pidginmenutray.h',
 	'pidginmessage.h',
 	'pidgintalkatu.h',
 	'pidgintooltip.h',

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pidginmenutray.c	Mon Nov 18 21:02:18 2019 -0600
@@ -0,0 +1,204 @@
+/*
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+#include "internal.h"
+
+#include "debug.h"
+
+#include "pidginmenutray.h"
+
+struct _PidginMenuTray {
+	GtkMenuItem parent;
+
+	GtkWidget *tray;
+};
+
+enum {
+	PROP_ZERO = 0,
+	PROP_BOX,
+	N_PROPERTIES
+};
+
+/******************************************************************************
+ * Globals
+ *****************************************************************************/
+static GParamSpec *properties[N_PROPERTIES] = {NULL, };
+
+/******************************************************************************
+ * Item Stuff
+ *****************************************************************************/
+static void
+pidgin_menu_tray_select(GtkMenuItem *widget) {
+	/* this may look like nothing, but it's really overriding the
+	 * GtkMenuItem's select function so that it doesn't get highlighted like
+	 * a normal menu item would.
+	 */
+}
+
+static void
+pidgin_menu_tray_deselect(GtkMenuItem *widget) {
+	/* Probably not necessary, but I'd rather be safe than sorry.  We're
+	 * overridding the select, so it makes sense to override deselect as well.
+	 */
+}
+
+/******************************************************************************
+ * GObject Implementation
+ *****************************************************************************/
+G_DEFINE_TYPE(PidginMenuTray, pidgin_menu_tray, GTK_TYPE_MENU_ITEM);
+
+static void
+pidgin_menu_tray_get_property(GObject *obj, guint param_id, GValue *value,
+                              GParamSpec *pspec)
+{
+	PidginMenuTray *menu_tray = PIDGIN_MENU_TRAY(obj);
+
+	switch(param_id) {
+		case PROP_BOX:
+			g_value_set_object(value, pidgin_menu_tray_get_box(menu_tray));
+			break;
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec);
+			break;
+	}
+}
+
+static void
+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);
+}
+
+static void
+pidgin_menu_tray_class_init(PidginMenuTrayClass *klass) {
+	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
+	GtkMenuItemClass *menu_item_class = GTK_MENU_ITEM_CLASS(klass);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
+
+	obj_class->get_property = pidgin_menu_tray_get_property;
+
+	menu_item_class->select = pidgin_menu_tray_select;
+	menu_item_class->deselect = pidgin_menu_tray_deselect;
+
+	widget_class->map = pidgin_menu_tray_map;
+
+	properties[PROP_BOX] = g_param_spec_object("box", "The box", "The box",
+	                                           GTK_TYPE_BOX,
+	                                           G_PARAM_READABLE);
+
+	g_object_class_install_properties(obj_class, N_PROPERTIES, properties);
+}
+
+static void
+pidgin_menu_tray_init(PidginMenuTray *menu_tray) {
+	GtkWidget *widget = GTK_WIDGET(menu_tray);
+	gint height = -1;
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+	/* Gtk3 docs says, it should be replaced with gtk_widget_set_hexpand and
+	 * gtk_widget_set_halign. But it doesn't seems to work. */
+	gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE);
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+	if(!GTK_IS_WIDGET(menu_tray->tray)) {
+		menu_tray->tray = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+	}
+
+	if(gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, NULL, &height)) {
+		gtk_widget_set_size_request(widget, -1, height);
+	}
+
+	gtk_widget_show(menu_tray->tray);
+}
+
+/******************************************************************************
+ * API
+ *****************************************************************************/
+GtkWidget *
+pidgin_menu_tray_new() {
+	return g_object_new(PIDGIN_TYPE_MENU_TRAY, NULL);
+}
+
+GtkWidget *
+pidgin_menu_tray_get_box(PidginMenuTray *menu_tray) {
+	g_return_val_if_fail(PIDGIN_IS_MENU_TRAY(menu_tray), NULL);
+
+	return menu_tray->tray;
+}
+
+static void
+pidgin_menu_tray_add(PidginMenuTray *menu_tray, GtkWidget *widget,
+					   const char *tooltip, gboolean prepend)
+{
+	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)) {
+		GtkWidget *event;
+
+		event = gtk_event_box_new();
+		gtk_container_add(GTK_CONTAINER(event), widget);
+		gtk_widget_show(event);
+		widget = event;
+	}
+
+	pidgin_menu_tray_set_tooltip(menu_tray, widget, tooltip);
+
+	if (prepend) {
+		gtk_box_pack_start(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0);
+	} else {
+		gtk_box_pack_end(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0);
+	}
+}
+
+void
+pidgin_menu_tray_append(PidginMenuTray *menu_tray, GtkWidget *widget,
+                        const char *tooltip)
+{
+	pidgin_menu_tray_add(menu_tray, widget, tooltip, FALSE);
+}
+
+void
+pidgin_menu_tray_prepend(PidginMenuTray *menu_tray, GtkWidget *widget,
+                         const char *tooltip)
+{
+	pidgin_menu_tray_add(menu_tray, widget, tooltip, TRUE);
+}
+
+void
+pidgin_menu_tray_set_tooltip(PidginMenuTray *menu_tray, GtkWidget *widget,
+                             const char *tooltip)
+{
+	/* Should we check whether widget is a child of menu_tray? */
+
+	/*
+	 * If the widget does not have its own window, then it
+	 * must have automatically been added to an event box
+	 * when it was added to the menu tray.  If this is the
+	 * case, we want to set the tooltip on the widget's parent,
+	 * not on the widget itself.
+	 */
+	if (!gtk_widget_get_has_window(widget)) {
+		widget = gtk_widget_get_parent(widget);
+	}
+
+	gtk_widget_set_tooltip_text(widget, tooltip);
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pidginmenutray.h	Mon Nov 18 21:02:18 2019 -0600
@@ -0,0 +1,95 @@
+/* Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef PIDGIN_MENU_TRAY_H
+#define PIDGIN_MENU_TRAY_H
+
+/**
+ * SECTION:gtkmenutray
+ * @section_id: pidgin-gtkmenutray
+ * @short_description: <filename>gtkmenutray.h</filename>
+ * @title: Tray Menu Item
+ */
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define PIDGIN_TYPE_MENU_TRAY (pidgin_menu_tray_get_type())
+G_DECLARE_FINAL_TYPE(PidginMenuTray, pidgin_menu_tray, PIDGIN, MENU_TRAY, GtkMenuItem)
+
+/**
+ * PidginMenuTray:
+ *
+ * A PidginMenuTray is a #GtkMenuItem that allows you to pack icons into it
+ * similar to a system notification area but in a windows menu bar.
+ */
+
+/**
+ * pidgin_menu_tray_new:
+ *
+ * Creates a new PidginMenuTray
+ *
+ * Returns: A new PidginMenuTray
+ */
+GtkWidget *pidgin_menu_tray_new(void);
+
+/**
+ * pidgin_menu_tray_get_box:
+ * @menu_tray: The PidginMenuTray
+ *
+ * Gets the box for the PidginMenuTray
+ *
+ * Returns: (transfer none): The box that this menu tray is using
+ */
+GtkWidget *pidgin_menu_tray_get_box(PidginMenuTray *menu_tray);
+
+/**
+ * pidgin_menu_tray_append:
+ * @menu_tray: The tray
+ * @widget:    The widget
+ * @tooltip:   The tooltip for this widget
+ *
+ * Appends a widget into the tray
+ */
+void pidgin_menu_tray_append(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip);
+
+/**
+ * pidgin_menu_tray_prepend:
+ * @menu_tray: The tray
+ * @widget:    The widget
+ * @tooltip:   The tooltip for this widget
+ *
+ * Prepends a widget into the tray
+ */
+void pidgin_menu_tray_prepend(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip);
+
+/**
+ * pidgin_menu_tray_set_tooltip:
+ * @menu_tray: The tray
+ * @widget:    The widget
+ * @tooltip:   The tooltip to set for the widget
+ *
+ * Set the tooltip for a widget
+ */
+void pidgin_menu_tray_set_tooltip(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip);
+
+G_END_DECLS
+
+#endif /* PIDGIN_MENU_TRAY_H */