Package: alltray
Version: 0.69-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu jaunty ubuntu-patch
Alltray should not use its own tooltip theme for the trayicon that it
adds. It should respect the system theme.
*** /tmp/tmpEJpcsm
In Ubuntu, we've applied the attached patch to achieve the following:
* Fix "alltray trayicons use their own tooltip theme" (LP: #355077) by
adding 10-dont-use-pop-up-bubble.dpatch.
We thought you might be interested in doing the same.
-- System Information:
Debian Release: lenny/sid
APT prefers intrepid-updates
APT policy: (500, 'intrepid-updates'), (500, 'intrepid-security'), (500,
'intrepid-backports'), (500, 'intrepid')
Architecture: i386 (i686)
Kernel: Linux 2.6.27-11-generic (SMP w/2 CPU cores)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -u alltray-0.69/debian/changelog alltray-0.69/debian/changelog
diff -u alltray-0.69/debian/patches/00list alltray-0.69/debian/patches/00list
--- alltray-0.69/debian/patches/00list
+++ alltray-0.69/debian/patches/00list
@@ -2,0 +3 @@
+10-dont-use-pop-up-bubble.dpatch
only in patch2:
unchanged:
--- alltray-0.69.orig/debian/patches/10-dont-use-pop-up-bubble.dpatch
+++ alltray-0.69/debian/patches/10-dont-use-pop-up-bubble.dpatch
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-dont-use-pop-up-bubble.dpatch by Kyran Lange <kyran.la...@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix "alltray trayicons use their own tooltip theme" (LP: #355077)
+## DP: src/trayicon.c and src/utils.c: Apply revision 25 from
+## DP: old-maintenance branch upstream in order to stop alltray using its
+## DP: own pop-up bubble for tooltips
+
+...@dpatch@
+diff -urNad alltray-0.69~/src/trayicon.c alltray-0.69/src/trayicon.c
+--- alltray-0.69~/src/trayicon.c 2006-06-23 04:15:16.000000000 +0930
++++ alltray-0.69/src/trayicon.c 2009-04-16 12:39:06.000000000 +0930
+@@ -385,22 +385,6 @@
+
+ }
+
+-gboolean icon_window_enter_event(GtkWidget *widget, GdkEventButton * event,
+- gpointer user_data)
+-{
+-
+- win_struct *win= (win_struct*) user_data;
+-
+- if (debug) printf ("icon window enter event\n");
+-
+- win->balloon_message_allowed=TRUE;
+-
+- show_balloon (win, win->title, 0);
+-
+- return FALSE;
+-
+-}
+-
+ void create_tray_and_dock (win_struct *win)
+ {
+
+@@ -479,12 +463,6 @@
+ g_signal_connect ((gpointer) win->plug, "configure_event",
+ G_CALLBACK (icon_window_configure_event),
+ (gpointer) win);
+-
+-
+- g_signal_connect ((gpointer) win->plug, "enter_notify_event",
+- G_CALLBACK (icon_window_enter_event),
+- (gpointer) win);
+-
+
+ dock_window (win->manager_window, win->plug_xlib);
+
+diff -urNad alltray-0.69~/src/utils.c alltray-0.69/src/utils.c
+--- alltray-0.69~/src/utils.c 2009-04-16 12:39:06.000000000 +0930
++++ alltray-0.69/src/utils.c 2009-04-16 12:39:06.000000000 +0930
+@@ -1517,7 +1517,7 @@
+ win->title=g_strdup (title);
+
+ if (debug) printf ("win->title: %s\n", win->title);
+-
++ gtk_widget_set_tooltip_text(win->plug, win->title);
+ g_free(title);
+
+ if (win->title_time)
