Mercurial > pidgin.yaz
changeset 8305:57bdd25752c1
[gaim-migrate @ 9029]
The docklet should compile again. Yay!
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Sat, 21 Feb 2004 06:06:03 +0000 |
| parents | 42f1614783f0 |
| children | d94df977b502 |
| files | plugins/Makefile.am plugins/docklet/docklet.c src/gtkblist.c src/gtkblist.h |
| diffstat | 4 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/Makefile.am Sat Feb 21 00:10:07 2004 +0000 +++ b/plugins/Makefile.am Sat Feb 21 06:06:03 2004 +0000 @@ -1,4 +1,4 @@ -DIST_SUBDIRS = docklet gevolution gaim-remote gestures perl ssl tcl ticker +DIST_SUBDIRS = docklet gevolution gaim-remote gestures mono perl ssl tcl ticker if BUILD_GEVOLUTION GEVOLUTION_DIR = gevolution @@ -12,9 +12,14 @@ TCL_DIR = tcl endif +if USE_MONO +#MONO_DIR = mono +MONO_DIR = +endif + SUBDIRS = \ docklet gaim-remote $(GEVOLUTION_DIR) gestures \ - $(PERL_DIR) $(TCL_DIR) ssl ticker + $(MONO_DIR) $(PERL_DIR) $(TCL_DIR) ssl ticker plugindir = $(libdir)/gaim
--- a/plugins/docklet/docklet.c Sat Feb 21 00:10:07 2004 +0000 +++ b/plugins/docklet/docklet.c Sat Feb 21 06:06:03 2004 +0000 @@ -115,7 +115,7 @@ break; default: gaim_new_item_from_stock(menu, _("New Message..."), GAIM_STOCK_IM, G_CALLBACK(show_im_dialog), NULL, 0, 0, NULL); - gaim_new_item_from_stock(menu, _("Join A Chat..."), GAIM_STOCK_CHAT, G_CALLBACK(join_chat), NULL, 0, 0, NULL); + gaim_new_item_from_stock(menu, _("Join A Chat..."), GAIM_STOCK_CHAT, G_CALLBACK(gaim_gtk_blist_show_join_chat), NULL, 0, 0, NULL); break; }
--- a/src/gtkblist.c Sat Feb 21 00:10:07 2004 +0000 +++ b/src/gtkblist.c Sat Feb 21 06:06:03 2004 +0000 @@ -775,8 +775,8 @@ g_free(info); } -static void -join_chat(void) +void +gaim_gtk_blist_show_join_chat(void) { GtkWidget *hbox, *vbox; GtkWidget *rowbox; @@ -893,7 +893,7 @@ return; } } - join_chat(); + gaim_gtk_blist_show_join_chat(); } static void gtk_blist_button_away_cb(GtkWidget *w, gpointer data) @@ -2219,7 +2219,7 @@ /* Buddies menu */ { N_("/_Buddies"), NULL, NULL, 0, "<Branch>" }, { N_("/Buddies/New Instant _Message..."), "<CTL>M", show_im_dialog, 0, "<StockItem>", GAIM_STOCK_IM }, - { N_("/Buddies/Join a _Chat..."), "<CTL>C", join_chat, 0, "<StockItem>", GAIM_STOCK_CHAT }, + { N_("/Buddies/Join a _Chat..."), "<CTL>C", gaim_gtk_blist_show_join_chat, 0, "<StockItem>", GAIM_STOCK_CHAT }, { N_("/Buddies/Get User _Info..."), "<CTL>I", show_info_dialog, 0, "<StockItem>", GAIM_STOCK_INFO }, { "/Buddies/sep1", NULL, NULL, 0, "<Separator>" }, { N_("/Buddies/Show _Offline Buddies"), NULL, gaim_gtk_blist_edit_mode_cb, 1, "<CheckItem>"},