Ticket #84: padevchooser-gtk-status-icon.patch

configure.ac

@@ -43 +43 @@
-AC_SUBST(GUILIBS_CFLAGS)
-AC_SUBST(GUILIBS_LIBS)
-
+padc_save_cflags="$CFLAGS"
+CFLAGS="$GUILIBS_CFLAGS"
+AC_CHECK_HEADER([gtk/gtkstatusicon.h], [AC_DEFINE(HAVE_GTKSTATUSICON_H, 1, [Define to 1 if you have the <gtk/gtkstatusicon.h> header file.])])
+CFLAGS="$padc_save_cflags"
+
-if test -d ../pulseaudio ; then
-   PULSE_CFLAGS='-I$(top_srcdir)/../pulseaudio/src'
-   PULSE_LIBS='-L$(top_srcdir)/../pulseaudio/src/.libs -lpulse -lpulse-mainloop-glib -lpulse-browse'

src/padevchooser.c

@@ -38 +38 @@
-#include <pulse/browser.h>
-#include <pulse/glib-mainloop.h>
-
+#ifdef HAVE_GTKSTATUSICON_H
+#include <gtk/gtkstatusicon.h>
+#else
-#include "eggtrayicon.h"
+#endif
+
+#include <gdk/gdkx.h>
+
-#include "x11prop.h"
-
-#define GCONF_PREFIX "/apps/padevchooser"
@@ -53 +60 @@
-static NotifyNotification *notification = NULL;
-static gchar *last_events = NULL;
-
+#ifdef HAVE_GTKSTATUSICON_H
+static GtkStatusIcon *tray_icon = NULL;
+#else
-static EggTrayIcon *tray_icon = NULL;
+#endif
-static gchar *current_server = NULL, *current_sink = NULL, *current_source = NULL;
-static struct menu_item_info *current_source_menu_item_info = NULL, *current_sink_menu_item_info = NULL, *current_server_menu_item_info = NULL;
-static GtkMenu *menu = NULL, *sink_submenu = NULL, *source_submenu = NULL, *server_submenu = NULL;
@@ -346 +357 @@
-    look_for_current_menu_items();
-}
-
+#ifdef HAVE_GTKSTATUSICON_H
+static void tray_icon_on_click(GtkStatusIcon *status_icon, void * user_data) {
+    gtk_menu_popup(menu, NULL, NULL, gtk_status_icon_position_menu, status_icon, 1, gtk_get_current_event_time());
+}
+#else
-static void tray_icon_on_click(GtkWidget *widget, GdkEventButton* event) {
-    if (event->type == GDK_BUTTON_PRESS)
-        gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button, event->time);
-}
+#endif
-
-static void start_manager_cb(void) {
-    g_spawn_command_line_async("paman", NULL);
@@ -520 +537 @@
-    set_server(input_dialog("Other Server", "Please enter server name:", current_server));
-}
-
+#ifdef HAVE_GTKSTATUSICON_H
+static GtkStatusIcon *create_tray_icon(void) {
+    GtkStatusIcon *tray_icon;
+
+    tray_icon = gtk_status_icon_new();
+    /* handle left click on status icon; you may connect to the popup_menu
+     * signal for right-click, but it passes different args to the callback */
+    g_signal_connect_object(G_OBJECT(tray_icon), "activate", G_CALLBACK(tray_icon_on_click), tray_icon, 0);
+    gtk_status_icon_set_from_icon_name(tray_icon, "audio-card");
+    gtk_status_icon_set_tooltip(tray_icon, "PulseAudio Applet");
+    gtk_status_icon_set_visible(tray_icon, TRUE);
+
+    return tray_icon;
+}
+#else
-static EggTrayIcon *create_tray_icon(void) {
-    GtkTooltips *tips;
-    EggTrayIcon *tray_icon;
@@ -541 +573 @@
-
-    return tray_icon;
-}
+#endif
-
-static GtkWidget *append_menuitem(GtkMenu *m, const char *text, const char *icon_name) {
-    GtkWidget *item;