# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1077343563 0
# Node ID 57bdd25752c19e861a8adeb1765d90c3bfaeecb5
# Parent  42f1614783f0fe951e7035931621b57e29681b0f
[gaim-migrate @ 9029]
The docklet should compile again. Yay!

committer: Tailor Script <tailor@pidgin.im>

diff -r 42f1614783f0 -r 57bdd25752c1 plugins/Makefile.am
--- 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
 
diff -r 42f1614783f0 -r 57bdd25752c1 plugins/docklet/docklet.c
--- 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;
 	}
 
diff -r 42f1614783f0 -r 57bdd25752c1 src/gtkblist.c
--- 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>"},
diff -r 42f1614783f0 -r 57bdd25752c1 src/gtkblist.h
--- a/src/gtkblist.h	Sat Feb 21 00:10:07 2004 +0000
+++ b/src/gtkblist.h	Sat Feb 21 06:06:03 2004 +0000
@@ -196,5 +196,9 @@
  */
 void gaim_gtk_blist_update_protocol_actions();
 
+/**
+ * Shows the join chat dialog
+ */
+void gaim_gtk_blist_show_join_chat(void);
 
 #endif /* _GAIM_GTK_LIST_H_ */