Mercurial > pidgin.yaz
comparison pidgin/gtkblist.c @ 22874:02eda4bd2b22
Apply the custom smiley patches from #1187, from Jorge Villaseo (Masca) and
Mauro Srgio Ferreira Brasil.
I have not applied the bits on MSN yet. I will have to look at it later, but
I would rather someone else more familiar with the MSN code look at it first.
I changed some bits of the applied patch (whitespacing, camelcasing etc.), and
the bit that required a major version bump (in gtkthemes.h). There are a few
more things that need to be done for this to be merged back to i.p.p.
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 19 Feb 2008 19:41:56 +0000 |
| parents | 858ce8a1fc8c |
| children | fdda2b8a4146 |
comparison
equal
deleted
inserted
replaced
| 22310:f463d54e606b | 22874:02eda4bd2b22 |
|---|---|
| 55 #include "gtkprefs.h" | 55 #include "gtkprefs.h" |
| 56 #include "gtkprivacy.h" | 56 #include "gtkprivacy.h" |
| 57 #include "gtkroomlist.h" | 57 #include "gtkroomlist.h" |
| 58 #include "gtkstatusbox.h" | 58 #include "gtkstatusbox.h" |
| 59 #include "gtkscrollbook.h" | 59 #include "gtkscrollbook.h" |
| 60 #include "gtksmiley.h" | |
| 60 #include "gtkutils.h" | 61 #include "gtkutils.h" |
| 61 #include "pidgin/minidialog.h" | 62 #include "pidgin/minidialog.h" |
| 62 #include "pidgin/pidgintooltip.h" | 63 #include "pidgin/pidgintooltip.h" |
| 63 | 64 |
| 64 #include <gdk/gdkkeysyms.h> | 65 #include <gdk/gdkkeysyms.h> |
| 3076 | 3077 |
| 3077 /* Tools */ | 3078 /* Tools */ |
| 3078 { N_("/_Tools"), NULL, NULL, 0, "<Branch>", NULL }, | 3079 { N_("/_Tools"), NULL, NULL, 0, "<Branch>", NULL }, |
| 3079 { N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 1, "<Item>", NULL }, | 3080 { N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 1, "<Item>", NULL }, |
| 3080 { N_("/Tools/_Certificates"), NULL, pidgin_certmgr_show, 0, "<Item>", NULL }, | 3081 { N_("/Tools/_Certificates"), NULL, pidgin_certmgr_show, 0, "<Item>", NULL }, |
| 3082 { N_("/Tools/Smile_y"), "<CTL>Y", pidgin_smiley_manager_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SMILEY }, | |
| 3081 { N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 2, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS }, | 3083 { N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 2, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS }, |
| 3082 { N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES }, | 3084 { N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES }, |
| 3083 { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL }, | 3085 { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL }, |
| 3084 { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL }, | 3086 { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL }, |
| 3085 { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL }, | 3087 { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL }, |