# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1176313892 0
# Node ID 14a9d9f50b5d7006c21caf886ea0c927ae33452a
# Parent  b5118ddf37c23844af1315de5d7a007a39486045# Parent  ab086aa2e2107f6843607e9b49b8ddbcb4021709
merge of 'c5609c3b315c4f56aeae24c2339c9b422280584a'
     and 'cf2e36e704c0f7a9309e53f955f01f0ae864de5a'

diff -r b5118ddf37c2 -r 14a9d9f50b5d pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c	Wed Apr 11 17:46:01 2007 +0000
+++ b/pidgin/gtkdocklet.c	Wed Apr 11 17:51:32 2007 +0000
@@ -168,7 +168,7 @@
 		g_list_free(convs);
 
 	} else if (ui_ops->set_tooltip) {
-		ui_ops->set_tooltip(NULL);
+		ui_ops->set_tooltip(PIDGIN_NAME);
 	}
 
 	for(l = purple_accounts_get_all(); l != NULL; l = l->next) {
diff -r b5118ddf37c2 -r 14a9d9f50b5d po/sl.po