Mercurial > pidgin.yaz
comparison pidgin/gtkdocklet-gtk.c @ 30710:29e714e980b2
merge of 'c32c1fdff08db87b69fc0eb921a5eaafcb5ef67e'
and 'fcd99a6bb8c6362d64f295a1b95a5b1130460b85'
author | andrew.victor@mxit.com |
---|---|
date | Fri, 28 May 2010 21:10:09 +0000 |
parents | 26c1c5069c28 |
children | 3ed54142386f 7fb5e60fd919 |
comparison
equal
deleted
inserted
replaced
30709:d7325448badb | 30710:29e714e980b2 |
---|---|
36 } | 36 } |
37 | 37 |
38 static void | 38 static void |
39 docklet_gtk_status_clicked_cb(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data) | 39 docklet_gtk_status_clicked_cb(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data) |
40 { | 40 { |
41 pidgin_docklet_clicked(button); | 41 purple_debug_info("docklet", "The button is %u\n", button); |
42 #ifdef GDK_WINDOWING_QUARTZ | |
43 /* You can only click left mouse button on MacOSX native GTK. Let that be the menu */ | |
44 pidgin_docklet_clicked(3); | |
45 #else | |
46 pidgin_docklet_clicked(button); | |
47 #endif | |
42 } | 48 } |
43 | 49 |
44 static void | 50 static void |
45 docklet_gtk_status_update_icon(PurpleStatusPrimitive status, gboolean connecting, gboolean pending) | 51 docklet_gtk_status_update_icon(PurpleStatusPrimitive status, gboolean connecting, gboolean pending) |
46 { | 52 { |