pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

[Gaim-commits] CVS: gaim/src/protocols/gg gg.c,1.6,1.7

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/gg
In directory usw-pr-cvs1:/tmp/cvs-serv20666

Modified Files:
	gg.c 
Log Message:
Fixed an unused variable warning.



Index: gg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/gg.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gg.c	2001/10/18 21:44:09	1.6
+++ gg.c	2001/10/21 00:14:41	1.7
@@ -92,8 +92,8 @@
 
 static gchar *charset_convert(const gchar *locstr, char *encsrc, char *encdst)
 {
-	gchar *result = NULL;
 #ifdef HAVE_ICONV
+	gchar *result = NULL;
 	if (iconv_string(encdst, encsrc, locstr, locstr+strlen(locstr)+1, &result, NULL) >= 0)
 		return result;
 #endif

[Gaim-commits] CVS: gaim/src about.c,1.54,1.55

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv18164

Modified Files:
	about.c 
Log Message:
 I like the v ;-)



Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- about.c	2001/10/19 20:37:14	1.54
+++ about.c	2001/10/20 18:41:47	1.55
@@ -103,7 +103,7 @@
 		gtk_container_add(GTK_CONTAINER(about), vbox);
 		gtk_widget_show(vbox);
 
-		frame = gtk_frame_new("Gaim " VERSION);
+		frame = gtk_frame_new("Gaim v" VERSION);
 		gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
 		gtk_widget_show(frame);
 

[Gaim-commits] CVS: gaim/src dialogs.c,1.264,1.265

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv15773/src

Modified Files:
	dialogs.c 
Log Message:
Fixed a bug that causes the group list to not be updated when you change accounts
(on the add buddy dialog) [reported by espectro]



Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- dialogs.c	2001/10/19 20:31:40	1.264
+++ dialogs.c	2001/10/20 18:30:20	1.265
@@ -816,7 +816,11 @@
 {
 	struct addbuddy *b = gtk_object_get_user_data(w);
 
+	/* Save our account */
 	b->gc = gc;
+
+	/* We also want to update our group list */	
+	gtk_combo_set_popdown_strings(GTK_COMBO(b->combo), groups_tree(gc ? gc : connections->data));
 }
 
 static void create_online_user_names(struct addbuddy *b)

[Gaim-commits] CVS: gaim ChangeLog,1.329,1.330

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv15773

Modified Files:
	ChangeLog 
Log Message:
Fixed a bug that causes the group list to not be updated when you change accounts
(on the add buddy dialog) [reported by espectro]



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -d -r1.329 -r1.330
--- ChangeLog	2001/10/19 18:44:52	1.329
+++ ChangeLog	2001/10/20 18:30:20	1.330
@@ -6,6 +6,8 @@
 	* Better recoding in Gadu-Gadu (thanks Arkadiusz Miskiewicz)
 	* Open Mail button for when you get new mail (Yahoo and MSN)
 	* New buddy pounce option: Popup Notification
+	* When adding a buddy, the groups list now updates when you switch
+	  accounts.
 
 version 0.46 (10/18/2001):
 	* New applet icons (courtesy David Raeman)

[Gaim-commits] CVS: gaim/src buddy.c,1.253,1.254

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv25629

Modified Files:
	buddy.c 
Log Message:
do them before we remove the plugins, so that you don't get the "this connection's protocol has been ripped out from underneath it" message 10 times.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- buddy.c	2001/10/19 21:55:46	1.253
+++ buddy.c	2001/10/19 21:57:09	1.254
@@ -1271,11 +1271,11 @@
 	/* first we tell those who have requested it we're quitting */
 	plugin_event(event_quit, 0, 0, 0, 0);
 
+	signoff_all();
 #ifdef GAIM_PLUGINS
 	/* then we remove everyone in a mass suicide */
 	remove_all_plugins();
 #endif
-	signoff_all();
 	system_log(log_quit, NULL, NULL, OPT_LOG_BUDDY_SIGNON | OPT_LOG_MY_SIGNON);
 #ifdef USE_PERL
 	perl_end();

[Gaim-commits] CVS: gaim/src buddy.c,1.252,1.253 multi.c,1.94,1.95 ui.h,1.11,1.12

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv22543/src

Modified Files:
	buddy.c multi.c ui.h 
Log Message:
some protocols (like icq) expect that they'll be signed off. if they're compiled statically they need to be signed off.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- buddy.c	2001/10/19 19:12:57	1.252
+++ buddy.c	2001/10/19 21:55:46	1.253
@@ -1275,6 +1275,7 @@
 	/* then we remove everyone in a mass suicide */
 	remove_all_plugins();
 #endif
+	signoff_all();
 	system_log(log_quit, NULL, NULL, OPT_LOG_BUDDY_SIGNON | OPT_LOG_MY_SIGNON);
 #ifdef USE_PERL
 	perl_end();

Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- multi.c	2001/10/17 17:43:17	1.94
+++ multi.c	2001/10/19 21:55:46	1.95
@@ -1223,7 +1223,7 @@
 	}
 }
 
-void signoff_all(gpointer w, gpointer d)
+void signoff_all()
 {
 	GSList *c = connections;
 	struct gaim_connection *g = NULL;

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ui.h	2001/10/17 10:11:46	1.11
+++ ui.h	2001/10/19 21:55:46	1.12
@@ -291,7 +291,7 @@
 extern void update_num_groups();
 extern void show_buddy_list();
 extern void refresh_buddy_window();
-extern void signoff_all(gpointer, gpointer);
+extern void signoff_all();
 extern void do_im_back();
 extern void set_buddy(struct gaim_connection *, struct buddy *);
 extern void build_edit_tree();

[Gaim-commits] CVS: gaim/src prpl.c,1.41,1.42

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv15880

Modified Files:
	prpl.c 
Log Message:
copy and paste is fun.


Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- prpl.c	2001/10/19 21:23:23	1.41
+++ prpl.c	2001/10/19 21:27:07	1.42
@@ -444,7 +444,7 @@
 		urlbut = picture_button(mn->email_win, _("Open Mail"), tb_forward_xpm);
 		gtk_box_pack_end(GTK_BOX(hbox), urlbut, 0, 0, 5);
 		gtk_signal_connect(GTK_OBJECT(urlbut), "clicked", GTK_SIGNAL_FUNC(open_url_nw), mn->url);
-		gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(des_email_win), mn);
+		gtk_signal_connect(GTK_OBJECT(urlbut), "clicked", GTK_SIGNAL_FUNC(des_email_win), mn);
 	}
 
 	gtk_widget_show(mn->email_win);

[Gaim-commits] CVS: gaim/src prpl.c,1.40,1.41

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv14945

Modified Files:
	prpl.c 
Log Message:
close


Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- prpl.c	2001/10/18 22:36:47	1.40
+++ prpl.c	2001/10/19 21:23:23	1.41
@@ -444,6 +444,7 @@
 		urlbut = picture_button(mn->email_win, _("Open Mail"), tb_forward_xpm);
 		gtk_box_pack_end(GTK_BOX(hbox), urlbut, 0, 0, 5);
 		gtk_signal_connect(GTK_OBJECT(urlbut), "clicked", GTK_SIGNAL_FUNC(open_url_nw), mn->url);
+		gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(des_email_win), mn);
 	}
 
 	gtk_widget_show(mn->email_win);

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.55,1.56

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv9410

Modified Files:
	gtkimhtml.c 
Log Message:
oh no! i'm exposed!


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- gtkimhtml.c	2001/10/18 20:56:59	1.55
+++ gtkimhtml.c	2001/10/19 20:59:58	1.56
@@ -407,7 +407,7 @@
 	attributes.wclass = GDK_INPUT_OUTPUT;
 	attributes.visual = gtk_widget_get_visual (widget);
 	attributes.colormap = gtk_widget_get_colormap (widget);
-	attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK;
+	attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK;
 
 	attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 

[Gaim-commits] CVS: gaim/src about.c,1.53,1.54

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv4663

Modified Files:
	about.c 
Log Message:
php :)



Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- about.c	2001/10/18 20:56:59	1.53
+++ about.c	2001/10/19 20:37:14	1.54
@@ -231,7 +231,7 @@
 					"you can talk to one of the Gaim developers for more "
 					"assistance; their contact information is in the "
 					"AUTHORS file in the Gaim source, or at "
-					WEBSITE "contact.shtml. If you can't get online and "
+					WEBSITE "contactinfo.php. If you can't get online and "
 					"still need more assistance, feel free to email us "
 					"at ga...@ma.... Thanks for using Gaim!"));
 		gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);

[Gaim-commits] CVS: gaim/src aim.c,1.169,1.170

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv3862

Modified Files:
	aim.c 
Log Message:
php


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- aim.c	2001/10/18 07:22:26	1.169
+++ aim.c	2001/10/19 20:34:08	1.170
@@ -398,7 +398,7 @@
 			"Please make sure to specify what you were doing at the time,\n"
 			"and post the backtrace from the core file. If you do not know\n"
 			"how to get the backtrace, please get instructions at\n"
-			WEBSITE "gdb.shtml. If you need further\n"
+			WEBSITE "gdb.php. If you need further\n"
 			"assistance, please IM either EWarmenhoven or RobFlynn and\n"
 			"they can help you.\n");
 		abort();

[Gaim-commits] CVS: gaim/src dialogs.c,1.263,1.264

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv3607

Modified Files:
	dialogs.c 
Log Message:
rob, you should --enable-debug :)


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -d -r1.263 -r1.264
--- dialogs.c	2001/10/19 18:44:52	1.263
+++ dialogs.c	2001/10/19 20:31:40	1.264
@@ -1067,9 +1067,7 @@
 	GtkWidget *label;
 	GtkWidget *bbox;
 	GtkWidget *vbox;
-	GtkWidget *hbox;
 	GtkWidget *button;
-	GtkWidget *sep;
 	GtkWidget *frame;
 	GtkWidget *table;
 	GtkWidget *optmenu;

[Gaim-commits] CVS: gaim/src buddy.c,1.251,1.252

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv17182

Modified Files:
	buddy.c 
Log Message:
This is probably a better solution.



Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- buddy.c	2001/10/19 18:44:52	1.251
+++ buddy.c	2001/10/19 19:12:57	1.252
@@ -1465,13 +1465,14 @@
 				do_error_dialog(tmp, _("Buddy Pounce"));
 			}
 			if (b->options & OPT_POUNCE_SEND_IM) {
-				c = find_conversation(name);
-				if (c == NULL)
-					c = new_conversation(name);
+				if (strlen(b->message) > 0) {
+					c = find_conversation(name);
 
-				set_convo_gc(c, u->gc);
+					if (c == NULL)
+						c = new_conversation(name);
 
-				if (strlen(b->message) > 0) {
+					set_convo_gc(c, u->gc);
+
 					write_to_conv(c, b->message, WFLAG_SEND, NULL, time((time_t) NULL));
 					serv_send_im(u->gc, name, b->message, 0);
 				}

[Gaim-commits] CVS: gaim/src gaim.h,1.284,1.285

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv12400

Modified Files:
	gaim.h 
Log Message:
You're pretty fly for a white guy.



Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- gaim.h	2001/10/19 18:44:52	1.284
+++ gaim.h	2001/10/19 18:51:33	1.285
@@ -141,12 +141,12 @@
 	log_quit
 };
 
-#define OPT_POUNCE_POPUP  	0x001
+#define OPT_POUNCE_POPUP	0x001
 #define OPT_POUNCE_SEND_IM	0x002
 #define OPT_POUNCE_COMMAND	0x004
 #define OPT_POUNCE_SOUND	0x008
 
-#define OPT_POUNCE_SIGNON 	0x010
+#define OPT_POUNCE_SIGNON	0x010
 #define OPT_POUNCE_UNAWAY	0x020
 #define OPT_POUNCE_UNIDLE	0x040
 

[Gaim-commits] CVS: gaim/src buddy.c,1.250,1.251 dialogs.c,1.262,1.263 gaim.h,1.283,1.284

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv10758/src

Modified Files:
	buddy.c dialogs.c gaim.h 
Log Message:
New buddy pounce action: popup notification window.

Thanks for the suggestion, Allan Third.



Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- buddy.c	2001/10/10 04:16:41	1.250
+++ buddy.c	2001/10/19 18:44:52	1.251
@@ -1451,6 +1451,19 @@
 
 				set_convo_gc(c, u->gc);
 			}
+			if (b->options & OPT_POUNCE_NOTIFY) {
+				char tmp[1024];
+
+				/* I know the line below is really ugly. I only did it this way
+				 * because I thought it'd be funny :-) */
+
+				g_snprintf(tmp, sizeof(tmp), "%s has %s", name, 
+					(b->options & OPT_POUNCE_SIGNON) ? "signed on" : 
+					(b->options & OPT_POUNCE_UNIDLE) ? "returned from being idle" : 
+					"returned from being away");
+
+				do_error_dialog(tmp, _("Buddy Pounce"));
+			}
 			if (b->options & OPT_POUNCE_SEND_IM) {
 				c = find_conversation(name);
 				if (c == NULL)
@@ -1458,8 +1471,10 @@
 
 				set_convo_gc(c, u->gc);
 
-				write_to_conv(c, b->message, WFLAG_SEND, NULL, time((time_t) NULL));
-				serv_send_im(u->gc, name, b->message, 0);
+				if (strlen(b->message) > 0) {
+					write_to_conv(c, b->message, WFLAG_SEND, NULL, time((time_t) NULL));
+					serv_send_im(u->gc, name, b->message, 0);
+				}
 			}
 			if (b->options & OPT_POUNCE_COMMAND) {
 				int pid = fork();

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -d -r1.262 -r1.263
--- dialogs.c	2001/10/18 07:26:56	1.262
+++ dialogs.c	2001/10/19 18:44:52	1.263
@@ -134,6 +134,7 @@
 	GtkWidget *command;
 	GtkWidget *sendim;
 	GtkWidget *openwindow;
+	GtkWidget *popupnotify;
 	GtkWidget *p_signon;
 	GtkWidget *p_unaway;
 	GtkWidget *p_unidle;
@@ -978,6 +979,9 @@
 
 	bp->options = 0;
 
+	if (GTK_TOGGLE_BUTTON(b->popupnotify)->active)
+		bp->options |= OPT_POUNCE_NOTIFY;
+
 	if (GTK_TOGGLE_BUTTON(b->openwindow)->active)
 		bp->options |= OPT_POUNCE_POPUP;
 
@@ -1018,27 +1022,15 @@
 	b->user = u;
 }
 
-static void pounce_user_menu(struct addbp *b, GtkWidget *box)
+static GtkWidget *pounce_user_menu(struct addbp *b)
 {
-	GtkWidget *hbox;
-	GtkWidget *label;
 	GtkWidget *optmenu;
 	GtkWidget *menu;
 	GtkWidget *opt;
 	GSList *u = aim_users;
 	struct aim_user *a;
 
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-
-	label = gtk_label_new(_("Pounce buddy as:"));
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_widget_show(label);
-
 	optmenu = gtk_option_menu_new();
-	gtk_box_pack_start(GTK_BOX(hbox), optmenu, FALSE, FALSE, 0);
-	gtk_widget_show(optmenu);
 
 	menu = gtk_menu_new();
 
@@ -1065,6 +1057,8 @@
 	b->user = ((struct gaim_connection *)connections->data)->user;
 
 	b->menu = optmenu;
+
+	return optmenu;
 }
 
 
@@ -1076,6 +1070,9 @@
 	GtkWidget *hbox;
 	GtkWidget *button;
 	GtkWidget *sep;
+	GtkWidget *frame;
+	GtkWidget *table;
+	GtkWidget *optmenu;
 
 	struct addbp *b = g_new0(struct addbp, 1);
 
@@ -1093,85 +1090,111 @@
 	gtk_container_add(GTK_CONTAINER(b->window), vbox);
 	gtk_widget_show(vbox);
 
-	pounce_user_menu(b, vbox);
+	/* <pounce type="who"> */
+	frame = gtk_frame_new(_("Pounce Who"));
+	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+	gtk_widget_show(GTK_WIDGET(frame));
 
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
-	gtk_widget_show(hbox);
+	table = gtk_table_new(2, 2, FALSE);
+	gtk_container_add(GTK_CONTAINER(frame), table);
+	gtk_container_set_border_width(GTK_CONTAINER(table), 5);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 5);
+	gtk_table_set_row_spacings(GTK_TABLE(table), 5);
+	gtk_widget_show(table);
 
-	label = gtk_label_new(_("Buddy:"));
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	label = gtk_label_new(_("Account"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+	gtk_widget_show(label);
+
+	optmenu = pounce_user_menu(b);
+	gtk_table_attach(GTK_TABLE(table), optmenu, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+	gtk_widget_show(optmenu);
+
+	label = gtk_label_new(_("Buddy"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(label);
 
 	b->nameentry = gtk_entry_new();
-	gtk_box_pack_start(GTK_BOX(hbox), b->nameentry, TRUE, TRUE, 0);
+	gtk_table_attach(GTK_TABLE(table), b->nameentry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	if (name !=NULL)
 		gtk_entry_set_text(GTK_ENTRY(b->nameentry), name);
 	gtk_window_set_focus(GTK_WINDOW(b->window), b->nameentry);
 	gtk_widget_show(b->nameentry);
+	/* </pounce type="who"> */
 
-	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
-	gtk_widget_show(sep);
 
+	/* <pounce type="when"> */
+	frame = gtk_frame_new(_("Pounce When"));
+	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+	gtk_widget_show(GTK_WIDGET(frame));
+
+	table = gtk_table_new(2, 2, FALSE);
+	gtk_container_add(GTK_CONTAINER(frame), table);
+	gtk_container_set_border_width(GTK_CONTAINER(table), 5);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 5);
+	gtk_widget_show(table);
+	
 	b->p_signon = gtk_check_button_new_with_label(_("Pounce on sign on"));
 	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->p_signon), TRUE);
-	gtk_box_pack_start(GTK_BOX(vbox), b->p_signon, FALSE, FALSE, 0);
+	gtk_table_attach(GTK_TABLE(table), b->p_signon, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(b->p_signon);
 
 	b->p_unaway = gtk_check_button_new_with_label(_("Pounce on return from away"));
-	gtk_box_pack_start(GTK_BOX(vbox), b->p_unaway, FALSE, FALSE, 0);
+	gtk_table_attach(GTK_TABLE(table), b->p_unaway, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	gtk_widget_show(b->p_unaway);
 
 	b->p_unidle = gtk_check_button_new_with_label(_("Pounce on return from idle"));
-	gtk_box_pack_start(GTK_BOX(vbox), b->p_unidle, FALSE, FALSE, 0);
+	gtk_table_attach(GTK_TABLE(table), b->p_unidle, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(b->p_unidle);
 
-	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
-	gtk_widget_show(sep);
+	label = gtk_label_new(NULL);
+	gtk_table_attach(GTK_TABLE(table), label, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+	gtk_widget_show(label);
+	/* </pounce type="when"> */
+	
+	/* <pounce type="action"> */
+	frame = gtk_frame_new(_("Pounce Action"));
+	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+	gtk_widget_show(GTK_WIDGET(frame));
 
-	b->openwindow = gtk_check_button_new_with_label(_("Open IM window on pounce"));
+	table = gtk_table_new(4, 2, FALSE);
+	gtk_container_add(GTK_CONTAINER(frame), table);
+	gtk_container_set_border_width(GTK_CONTAINER(table), 5);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 5);
+	gtk_table_set_row_spacings(GTK_TABLE(table), 5);
+	gtk_widget_show(table);
+	
+	b->openwindow = gtk_check_button_new_with_label(_("Open IM Window"));
 	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->openwindow), FALSE);
-	gtk_box_pack_start(GTK_BOX(vbox), b->openwindow, FALSE, FALSE, 0);
+	gtk_table_attach(GTK_TABLE(table), b->openwindow, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(b->openwindow);
 
-	b->sendim = gtk_check_button_new_with_label(_("Send IM on pounce"));
+	b->popupnotify = gtk_check_button_new_with_label(_("Popup Notification"));
+	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->popupnotify), FALSE);
+	gtk_table_attach(GTK_TABLE(table), b->popupnotify, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
+	gtk_widget_show(b->popupnotify);
+
+	b->sendim = gtk_check_button_new_with_label(_("Send Message"));
 	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sendim), TRUE);
-	gtk_box_pack_start(GTK_BOX(vbox), b->sendim, FALSE, FALSE, 0);
+	gtk_table_attach(GTK_TABLE(table), b->sendim, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(b->sendim);
 
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
-	gtk_widget_show(hbox);
-
-	label = gtk_label_new(_("Message:"));
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_widget_show(label);
-
 	b->messentry = gtk_entry_new();
-	gtk_box_pack_start(GTK_BOX(hbox), b->messentry, TRUE, TRUE, 0);
+	gtk_table_attach(GTK_TABLE(table), b->messentry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	gtk_signal_connect(GTK_OBJECT(b->messentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b);
 	gtk_widget_show(b->messentry);
 
-	gtk_signal_connect(GTK_OBJECT(b->sendim), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive),
-			   b->messentry);
+	gtk_signal_connect(GTK_OBJECT(b->sendim), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), 
+			b->messentry);
 
 	b->command = gtk_check_button_new_with_label(_("Execute command on pounce"));
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->command), FALSE);
-	gtk_box_pack_start(GTK_BOX(vbox), b->command, FALSE, FALSE, 0);
+	gtk_table_attach(GTK_TABLE(table), b->command, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(b->command);
 
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
-	gtk_widget_show(hbox);
-
-	label = gtk_label_new(_("Command:"));
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_widget_show(label);
-
 	b->commentry = gtk_entry_new();
-	gtk_box_pack_start(GTK_BOX(hbox), b->commentry, TRUE, TRUE, 0);
+	gtk_table_attach(GTK_TABLE(table), b->commentry, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	gtk_signal_connect(GTK_OBJECT(b->commentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b);
 	gtk_widget_show(b->commentry);
 
@@ -1181,38 +1204,24 @@
 
 	b->sound = gtk_check_button_new_with_label(_("Play sound on pounce"));
 	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sound), FALSE);
-	gtk_box_pack_start(GTK_BOX(vbox), b->sound, FALSE, FALSE, 0);
+	gtk_table_attach(GTK_TABLE(table), b->sound, 0, 1, 3, 4, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(b->sound);
 
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
-	gtk_widget_show(hbox);
-
-	label = gtk_label_new(_("Sound:"));
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_widget_show(label);
-
 	b->soundentry = gtk_entry_new();
-	gtk_box_pack_start(GTK_BOX(hbox), b->soundentry, TRUE, TRUE, 0);
+	gtk_table_attach(GTK_TABLE(table), b->soundentry, 1, 2, 3, 4, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	gtk_signal_connect(GTK_OBJECT(b->soundentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b);
 	gtk_widget_show(b->soundentry);
 
 	gtk_widget_set_sensitive(b->soundentry, FALSE);
 	gtk_signal_connect(GTK_OBJECT(b->sound), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive),
 			   b->soundentry);
-
-	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
-	gtk_widget_show(sep);
+	/* </pounce type="action"> */
 
 	b->save = gtk_check_button_new_with_label(_("Save this pounce after activation"));
+	gtk_container_set_border_width(GTK_CONTAINER(b->save), 7);
 	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->save), FALSE);
 	gtk_box_pack_start(GTK_BOX(vbox), b->save, FALSE, FALSE, 0);
 	gtk_widget_show(b->save);
-
-	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
-	gtk_widget_show(sep);
 
 	bbox = gtk_hbox_new(FALSE, 5);
 	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- gaim.h	2001/10/18 12:12:37	1.283
+++ gaim.h	2001/10/19 18:44:52	1.284
@@ -141,16 +141,18 @@
 	log_quit
 };
 
-#define OPT_POUNCE_POPUP    0x001
-#define OPT_POUNCE_SEND_IM  0x002
-#define OPT_POUNCE_COMMAND  0x004
-#define OPT_POUNCE_SOUND		0x008
+#define OPT_POUNCE_POPUP  	0x001
+#define OPT_POUNCE_SEND_IM	0x002
+#define OPT_POUNCE_COMMAND	0x004
+#define OPT_POUNCE_SOUND	0x008
 
-#define OPT_POUNCE_SIGNON   0x010
-#define OPT_POUNCE_UNAWAY   0x020
-#define OPT_POUNCE_UNIDLE   0x040
+#define OPT_POUNCE_SIGNON 	0x010
+#define OPT_POUNCE_UNAWAY	0x020
+#define OPT_POUNCE_UNIDLE	0x040
 
-#define OPT_POUNCE_SAVE     0x100
+#define OPT_POUNCE_SAVE		0x100
+
+#define OPT_POUNCE_NOTIFY	0x200
 
 struct buddy_pounce {
         char name[80];

[Gaim-commits] CVS: gaim ChangeLog,1.328,1.329

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv10758

Modified Files:
	ChangeLog 
Log Message:
New buddy pounce action: popup notification window.

Thanks for the suggestion, Allan Third.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -d -r1.328 -r1.329
--- ChangeLog	2001/10/18 20:56:58	1.328
+++ ChangeLog	2001/10/19 18:44:52	1.329
@@ -5,6 +5,7 @@
 	  (thanks Arkadiusz Miskiewicz)
 	* Better recoding in Gadu-Gadu (thanks Arkadiusz Miskiewicz)
 	* Open Mail button for when you get new mail (Yahoo and MSN)
+	* New buddy pounce option: Popup Notification
 
 version 0.46 (10/18/2001):
 	* New applet icons (courtesy David Raeman)

[Gaim-commits] CVS: gaim/src applet.c,1.20,1.21

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv28803

Modified Files:
	applet.c 
Log Message:
we're smarter.


Index: applet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- applet.c	2001/10/18 07:26:56	1.20
+++ applet.c	2001/10/19 09:58:39	1.21
@@ -47,7 +47,7 @@
 GtkWidget *applet;
 static GtkWidget *icon;
 
-static GtkAllocation get_applet_pos(gboolean);
+static GtkAllocation *get_applet_pos(gboolean);
 static gint sizehint = 48;
 
 static GdkPixmap *get_applet_icon(const char *name)
@@ -172,8 +172,8 @@
 {
 	show_login();
 	if (blist_options & OPT_BLIST_NEAR_APPLET) {
-		GtkAllocation a = get_applet_pos(FALSE);
-		gtk_widget_set_uposition(mainwindow, a.x, a.y);
+		GtkAllocation *a = get_applet_pos(FALSE);
+		gtk_widget_set_uposition(mainwindow, a->x, a->y);
 	}
 }
 
@@ -237,11 +237,11 @@
 	applet_widget_unregister_callback(APPLET_WIDGET(applet), "away");
 }
 
-static GtkAllocation get_applet_pos(gboolean for_blist)
+static GtkAllocation *get_applet_pos(gboolean for_blist)
 {
 	gint x, y, pad;
 	GtkRequisition buddy_req, applet_req;
-	GtkAllocation result;
+	GtkAllocation *result = g_new0(GtkAllocation, 1);
 	GNOME_Panel_OrientType orient = applet_widget_get_panel_orient(APPLET_WIDGET(applet));
 	pad = 5;
 
@@ -258,39 +258,49 @@
 	}
 	applet_req = icon->requisition;
 
-	/* FIXME : we need to be smarter here */
 	switch (orient) {
 	case ORIENT_UP:
-		result.x = x;
-		result.y = y - (buddy_req.height + pad);
+		result->x = x;
+		result->y = y - (buddy_req.height + pad);
 		break;
 	case ORIENT_DOWN:
-		result.x = x;
-		result.y = y + applet_req.height + pad;
+		result->x = x;
+		result->y = y + applet_req.height + pad;
 		break;
 	case ORIENT_LEFT:
-		result.x = x - (buddy_req.width + pad);
-		result.y = y;
+		result->x = x - (buddy_req.width + pad);
+		result->y = y;
 		break;
 	case ORIENT_RIGHT:
-		result.x = x + applet_req.width + pad;
-		result.y = y;
+		result->x = x + applet_req.width + pad;
+		result->y = y;
 		break;
 	}
+
+	if (result->x < 0)
+		result->x = 0;
+	if (result->y < 0)
+		result->y = 0;
+	if (result->x > gdk_screen_width() - buddy_req.width)
+		result->x = gdk_screen_width() - buddy_req.width;
+	if (result->y > gdk_screen_height() - buddy_req.height)
+		result->y = gdk_screen_height() - buddy_req.height;
+
 	return result;
 }
 
 void createOnlinePopup()
 {
-	GtkAllocation al;
+	GtkAllocation *al;
 	if (blist)
 		gtk_widget_show(blist);
 	al = get_applet_pos(TRUE);
 	if (blist_options & OPT_BLIST_NEAR_APPLET)
-		gtk_widget_set_uposition(blist, al.x, al.y);
+		gtk_widget_set_uposition(blist, al->x, al->y);
 	else if (blist_options & OPT_BLIST_SAVED_WINDOWS)
 		gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff,
 					 blist_pos.y - blist_pos.yoff);
+	g_free(al);
 }
 
 void AppletClicked(GtkWidget *sender, GdkEventButton *ev, gpointer data)

[Gaim-commits] CVS: gaim/src list.c,1.3,1.4

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv21327

Modified Files:
	list.c 
Log Message:
deal with pounces


Index: list.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/list.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- list.c	2001/10/18 12:12:37	1.3
+++ list.c	2001/10/19 09:21:00	1.4
@@ -471,22 +471,6 @@
 	}
 }
 
-/* remove leading whitespace from a string */
-static char *remove_spaces(char *str)
-{
-	int i;
-	char *new;
-
-	if (str == NULL)
-		return NULL;
-
-	i = strspn(str, " \t\n\r\f");
-	new = &str[i];
-
-	return new;
-}
-
-
 /* translate an AIM 3 buddylist (*.lst) to a Gaim buddylist */
 static void translate_lst(FILE *src_fp, char *dest)
 {
@@ -497,7 +481,7 @@
 	sprintf(dest, "m 1\n");
 
 	while (fgets(line, BUF_LEN, src_fp)) {
-		line2 = remove_spaces(line);
+		line2 = g_strchug(line);
 		if (strstr(line2, "group") == line2) {
 			name = strpbrk(line2, " \t\n\r\f") + 1;
 			strcat(dest, "g ");
@@ -533,58 +517,73 @@
 	while (strstr(fgets(line, BUF_LEN, src_fp), "list") == NULL);
 
 	while (1) {
-		fgets(line, BUF_LEN, src_fp);
+		fgets(line, BUF_LEN, src_fp); g_strchomp(line);
 		if (strchr(line, '}') != NULL)
 			break;
 
-		/* Syntax starting with "<group> {" */
 		if (strchr(line, '{') != NULL) {
+			/* Syntax starting with "<group> {" */
+
 			strcat(dest, "g ");
-			buddy = remove_spaces(strtok(line, "{"));
+			buddy = g_strchug(strtok(line, "{"));
 			for (i = 0; i < strlen(buddy); i++) {
-				if (buddy[i] != '\"')
+				if (buddy[i] != '\"') {
 					strncat(dest, &buddy[i], 1);
+				}
 			}
 			strcat(dest, "\n");
 			while (strchr(fgets(line, BUF_LEN, src_fp), '}') == NULL) {
-				buddy = remove_spaces(line);
+				gboolean pounce = FALSE;
+				g_strchomp(line);
+				buddy = g_strchug(line);
+				debug_printf("\nbuddy: \"%s\"\n\n", buddy);
 				strcat(dest, "b ");
+				if (strchr(buddy, '{') != NULL) {
+					/* buddy pounce, etc */
+					char *pos = strchr(buddy, '{') - 1;
+					*pos = 0;
+					pounce = TRUE;
+				}
 				if (strchr(buddy, '\"') != NULL) {
 					buddy++;
 					strncat(dest, buddy, strchr(buddy, '\"') - buddy);
-					strcat(dest, "\n");
 				} else
 					strcat(dest, buddy);
+				strcat(dest, "\n");
+				if (pounce)
+					do
+						fgets(line, BUF_LEN, src_fp);
+					while (!strchr(line, '}'));
 			}
-		}
-		/* Syntax "group buddy buddy ..." */
-		else {
-			buddy = remove_spaces(strtok(line, " \n"));
+		} else {
+
+			/* Syntax "group buddy buddy ..." */
+			buddy = g_strchug(strtok(line, " \n"));
 			strcat(dest, "g ");
 			if (strchr(buddy, '\"') != NULL) {
 				strcat(dest, &buddy[1]);
 				strcat(dest, " ");
-				buddy = remove_spaces(strtok(NULL, " \n"));
+				buddy = g_strchug(strtok(NULL, " \n"));
 				while (strchr(buddy, '\"') == NULL) {
 					strcat(dest, buddy);
 					strcat(dest, " ");
-					buddy = remove_spaces(strtok(NULL, " \n"));
+					buddy = g_strchug(strtok(NULL, " \n"));
 				}
 				strncat(dest, buddy, strlen(buddy) - 1);
 			} else {
 				strcat(dest, buddy);
 			}
 			strcat(dest, "\n");
-			while ((buddy = remove_spaces(strtok(NULL, " \n"))) != NULL) {
+			while ((buddy = g_strchug(strtok(NULL, " \n"))) != NULL) {
 				strcat(dest, "b ");
 				if (strchr(buddy, '\"') != NULL) {
 					strcat(dest, &buddy[1]);
 					strcat(dest, " ");
-					buddy = remove_spaces(strtok(NULL, " \n"));
+					buddy = g_strchug(strtok(NULL, " \n"));
 					while (strchr(buddy, '\"') == NULL) {
 						strcat(dest, buddy);
 						strcat(dest, " ");
-						buddy = remove_spaces(strtok(NULL, " \n"));
+						buddy = g_strchug(strtok(NULL, " \n"));
 					}
 					strncat(dest, buddy, strlen(buddy) - 1);
 				} else {

[Gaim-commits] CVS: gaim/src prefs.c,1.185,1.186 ticker.c,1.16,1.17

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv12207

Modified Files:
	prefs.c ticker.c 
Log Message:
icon


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- prefs.c	2001/10/18 12:12:37	1.185
+++ prefs.c	2001/10/19 08:39:48	1.186
@@ -2362,6 +2362,8 @@
 	gtk_window_set_title(GTK_WINDOW(dw->window), _("Gaim debug output window"));
 	gtk_window_set_wmclass(GTK_WINDOW(dw->window), "debug_out", "Gaim");
 	gtk_signal_connect(GTK_OBJECT(dw->window), "delete_event", GTK_SIGNAL_FUNC(debug_delete), NULL);
+	gtk_widget_realize(dw->window);
+	aol_icon(dw->window->window);
 
 	box = gtk_hbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(dw->window), box);

Index: ticker.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ticker.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ticker.c	2001/10/18 07:26:56	1.16
+++ ticker.c	2001/10/19 08:39:48	1.17
@@ -79,6 +79,8 @@
         gtk_window_set_title (GTK_WINDOW(tickerwindow), "Gaim - Buddy Ticker");
         gtk_window_set_wmclass (GTK_WINDOW(tickerwindow), 
                                 "ticker", "Gaim");
+	gtk_widget_realize(tickerwindow);
+	aol_icon(tickerwindow->window);
 
         ticker = gtk_ticker_new();
         gtk_ticker_set_spacing( GTK_TICKER( ticker ), 20 );

[Gaim-commits] CVS: gaim/src conversation.c,1.283,1.284

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv4645

Modified Files:
	conversation.c 
Log Message:
hi.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- conversation.c	2001/10/18 20:56:59	1.283
+++ conversation.c	2001/10/19 08:01:41	1.284
@@ -2028,6 +2028,11 @@
 		gtk_widget_set_sensitive(c->block, FALSE);
 		gtk_widget_set_sensitive(c->add, FALSE);
 
+		if (c->whisper)
+			gtk_widget_set_sensitive(c->whisper, FALSE);
+		if (c->invite)
+			gtk_widget_set_sensitive(c->invite, FALSE);
+
 		return;
 	}
 

[Gaim-commits] CVS: gaim/src server.c,1.201,1.202

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv3894

Modified Files:
	server.c 
Log Message:
hi.


Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- server.c	2001/10/18 00:44:43	1.201
+++ server.c	2001/10/19 07:58:07	1.202
@@ -89,6 +89,7 @@
 		struct conversation *b = gc->buddy_chats->data;
 		gc->buddy_chats = g_slist_remove(gc->buddy_chats, b);
 		b->gc = NULL;
+		update_buttons_by_protocol(b);
 	}
 
 	if (gc->idle_timer > 0)

[Gaim-commits] CVS: gaim/doc gaim.1,1.37,1.38

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/doc
In directory usw-pr-cvs1:/tmp/cvs-serv11993

Modified Files:
	gaim.1 
Log Message:
0.47


Index: gaim.1
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/gaim.1,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- gaim.1	2001/10/18 12:12:36	1.37
+++ gaim.1	2001/10/19 05:54:16	1.38
@@ -21,7 +21,7 @@
 .\" USA.
 .TH gaim 1
 .SH NAME
-Gaim v0.46 \- Instant Messaging client
+Gaim v0.47 \- Instant Messaging client
 .SH SYNOPSIS
 .TP 5
 \fBgaim \fI[options]\fR

[Gaim-commits] CVS: gaim/src core.c,1.15,1.16

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv16286

Modified Files:
	core.c 
Log Message:
fine.


Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- core.c	2001/10/18 20:56:59	1.15
+++ core.c	2001/10/19 02:43:18	1.16
@@ -41,16 +41,13 @@
 static gint UI_fd = -1;
 GSList *uis = NULL;
 
-static guchar *UI_build(guint32 *len, guchar type, guchar subtype, va_list args1)
+static guchar *UI_build(guint32 *len, guchar type, guchar subtype, va_list args)
 {
-	va_list args2;
 	guchar *buffer;
 	guint32 pos;
 	int size;
 	void *data;
 
-	G_VA_COPY(args2, args1);
-
 	*len = sizeof(guchar) * 2 + 4;
 	buffer = g_malloc(*len);
 	pos = 0;
@@ -61,24 +58,22 @@
 	/* we come back and do size last */
 	pos += 4;
 
-	size = va_arg(args2, int);
+	size = va_arg(args, int);
 	while (size != -1) {
 		*len += size;
 		buffer = g_realloc(buffer, *len);
 
-		data = va_arg(args2, void *);
+		data = va_arg(args, void *);
 		memcpy(buffer + pos, data, size);
 		pos += size;
 
-		size = va_arg(args2, int);
+		size = va_arg(args, int);
 	}
 
 	pos -= sizeof(guchar) * 2 + 4;
 
 	/* now we do size */
 	memcpy(buffer + sizeof(guchar) * 2, &pos, 4);
-
-	va_end(args2);
 
 	return buffer;
 }

[Gaim-commits] CVS: gaim/src prpl.c,1.39,1.40

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv6921

Modified Files:
	prpl.c 
Log Message:
whoops


Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- prpl.c	2001/10/18 20:56:59	1.39
+++ prpl.c	2001/10/18 22:36:47	1.40
@@ -214,7 +214,7 @@
 	entry = gtk_entry_new();
 	gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 	if (def)
-		gtk_entry_set_text(GTK_ENTRY(entry), text);
+		gtk_entry_set_text(GTK_ENTRY(entry), def);
 	gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(act_prompt), p);
 	p->entry = entry;
 

[Gaim-commits] CVS: gaim/src/protocols/gg gg.c,1.5,1.6

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/gg
In directory usw-pr-cvs1:/tmp/cvs-serv25676/protocols/gg

Modified Files:
	gg.c 
Log Message:
i meant to do this already.


Index: gg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/gg.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gg.c	2001/10/18 20:56:59	1.5
+++ gg.c	2001/10/18 21:44:09	1.6
@@ -92,12 +92,12 @@
 
 static gchar *charset_convert(const gchar *locstr, char *encsrc, char *encdst)
 {
-       gchar *result = NULL;
+	gchar *result = NULL;
 #ifdef HAVE_ICONV
-        if (iconv_string(encdst, encsrc, locstr, locstr+strlen(locstr)+1, &result, NULL) < 0)
+	if (iconv_string(encdst, encsrc, locstr, locstr+strlen(locstr)+1, &result, NULL) >= 0)
+		return result;
 #endif
 	return g_strdup(locstr);
-	return result;
 }
 
 static gboolean invalid_uin(char *uin)