Mercurial > pidgin
changeset 30096:8de1ce16087c
merge of '1f6b3e2158dd96486ec32995b3f4f93d6b376780'
and '84c7f6ba2f4be4be1e1698201fae77872ac21fee'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 26 May 2010 13:50:08 +0000 |
| parents | 2152d97d145f (current diff) 26c1c5069c28 (diff) |
| children | 51c31805d2a7 |
| files | |
| diffstat | 3 files changed, 43 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkdocklet-gtk.c Wed May 26 08:46:57 2010 +0000 +++ b/pidgin/gtkdocklet-gtk.c Wed May 26 13:50:08 2010 +0000 @@ -38,7 +38,13 @@ static void docklet_gtk_status_clicked_cb(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data) { - pidgin_docklet_clicked(button); + purple_debug_info("docklet", "The button is %u\n", button); +#ifdef GDK_WINDOWING_QUARTZ + /* You can only click left mouse button on MacOSX native GTK. Let that be the menu */ + pidgin_docklet_clicked(3); +#else + pidgin_docklet_clicked(button); +#endif } static void
--- a/pidgin/pixmaps/Makefile.am Wed May 26 08:46:57 2010 +0000 +++ b/pidgin/pixmaps/Makefile.am Wed May 26 13:50:08 2010 +0000 @@ -482,6 +482,8 @@ tray/16/message_4bit.ico \ tray/16/offline_4bit.ico +TRAY_THEME = tray/hicolor/index.theme + TRAY_16 = \ tray/hicolor/16x16/status/pidgin-tray-away.png \ tray/hicolor/16x16/status/pidgin-tray-busy.png \ @@ -584,6 +586,7 @@ $(TOOLBAR_22) \ $(TOOLBAR_32) \ $(TOOLBAR_48) \ + $(TRAY_THEME) \ $(TRAY_16) \ $(TRAY_16_ICO) \ $(TRAY_22) \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/tray/hicolor/index.theme Wed May 26 13:50:08 2010 +0000 @@ -0,0 +1,33 @@ +[Icon Theme] +Name=Pidgin +Comment=Icon theme for Pidgin tray icons +Hidden=True +Directories=16x16/status,22x22/status,32x32/status,48x48/status,scalable/status + +[16x16/status] +Size=16 +Context=Status +Type=Threshold + +[22x22/status] +Size=22 +Context=Status +Type=Threshold + +[32x32/status] +Size=32 +Context=Status +Type=Threshold + +[48x48/status] +Size=48 +Context=Status +Type=Threshold + +[scalable/status] +MinSize=1 +Size=128 +MaxSize=256 +Context=Status +Type=Scalable +