[Gaim-commits] CVS: gaim/src gtkblist.c,1.59,1.60 prpl.c,1.119,1.120 ui.h,1.122,1.123

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16635

Modified Files:
	gtkblist.c prpl.c ui.h 
Log Message:
Removed protomenu from ui.h and prpl.c, and made it a static variable in
gtkblist.c. prpl.c only has one more line of gtk code! Yay! Now I can
sleep.


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- gtkblist.c	21 Jun 2003 08:38:33 -0000	1.59
+++ gtkblist.c	21 Jun 2003 09:54:33 -0000	1.60
@@ -44,6 +44,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+static GtkWidget *protomenu = NULL;
+
 GSList *gaim_gtk_blist_sort_methods = NULL;
 static struct gaim_gtk_blist_sort_method *current_sort_method = NULL;
 static GtkTreeIter sort_method_none(GaimBlistNode *node, struct gaim_buddy_list *blist, GtkTreeIter groupiter, GtkTreeIter *cur);

Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- prpl.c	21 Jun 2003 08:38:33 -0000	1.119
+++ prpl.c	21 Jun 2003 09:54:33 -0000	1.120
@@ -20,8 +20,6 @@
  */
 #include "internal.h"
 #include "debug.h"
-#include "gtkutils.h"
-#include "gtkblist.h"
 #include "multi.h"
 #include "notify.h"
 #include "prpl.h"
@@ -29,15 +27,8 @@
 #include "ui.h"
 #include "util.h"
 
-GtkWidget *protomenu = NULL;
-
-struct _prompt {
-	GtkWidget *window;
-	GtkWidget *entry;
-	void (*doit)(void *, const char *);
-	void (*dont)(void *);
-	void *data;
-};
+/* XXX */
+#include "gtkconv.h"
 
 GaimPlugin *
 gaim_find_prpl(GaimProtocol type)

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- ui.h	21 Jun 2003 07:59:53 -0000	1.122
+++ ui.h	21 Jun 2003 09:54:33 -0000	1.123
@@ -160,9 +160,6 @@
 void build_allow_list();
 void build_block_list();
 
-/* Globals in prpl.c */
-extern GtkWidget *protomenu;
-
 /* Globals in session.c */
 extern gboolean session_managed;