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

[Gaim-commits] CVS: gaim/pixmaps Makefile.am,1.79,1.80

[Sean E. <sea...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
Heh--I just added it twice.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- Makefile.am	25 Sep 2002 05:47:25 -0000	1.79
+++ Makefile.am	25 Sep 2002 06:02:11 -0000	1.80
@@ -54,6 +54,7 @@
 		moneymouth.xpm			\
 		mrt.xpm				\
 		msgpend.png			\
+		msgunread.png			\
 		no_icon.xpm			\
 		normal.xpm			\
 		offline.png			\
@@ -104,7 +105,7 @@
 gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png 
 
 gaimdistpixdir = $(datadir)/pixmaps/gaim
-gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png msgunread.png
+gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png 
 
 distpixmapdir = $(datadir)/pixmaps
 distpixmap_DATA = gaim.png

[Gaim-commits] CVS: gaim/pixmaps Makefile.am,1.78,1.79

[Sean E. <sea...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
make dist fix.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- Makefile.am	23 Sep 2002 15:14:37 -0000	1.78
+++ Makefile.am	25 Sep 2002 05:47:25 -0000	1.79
@@ -101,10 +101,10 @@
 gaimbuttonpix_DATA = edit.png
 
 gaimdialogpixdir = $(datadir)/pixmaps/gaim/dialogs
-gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png
+gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png 
 
 gaimdistpixdir = $(datadir)/pixmaps/gaim
-gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png
+gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png msgunread.png
 
 distpixmapdir = $(datadir)/pixmaps
 distpixmap_DATA = gaim.png

[Gaim-commits] CVS: gaim/src buddy.c,1.334,1.335

[Luke S. <lsc...@us...>]

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

Modified Files:
	buddy.c 
Log Message:
now the blist won't steal focus from a conversation


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -d -r1.334 -r1.335
--- buddy.c	23 Sep 2002 01:31:26 -0000	1.334
+++ buddy.c	24 Sep 2002 00:46:39 -0000	1.335
@@ -2352,7 +2352,7 @@
 			if (bs->sound != 2)
 				play_sound(SND_BUDDY_ARRIVE);
 			if (blist_options & OPT_BLIST_POPUP)
-				unhide_buddy_list();
+				gdk_window_show(blist->window);
 			pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
 							  NULL, (char **)login_icon_xpm);
 			gtk_widget_hide(bs->pix);
@@ -2411,7 +2411,7 @@
 		if (bs->sound != 1)
 			play_sound(SND_BUDDY_LEAVE);
 		if (blist_options & OPT_BLIST_POPUP)
-			unhide_buddy_list();
+			gdk_window_show(blist->window);
 		bs->connlist = g_slist_remove(bs->connlist, gc);
 		update_num_group(gs);
 		if (bs->log_timer > 0)

[Gaim-commits] CVS: gaim/pixmaps Makefile.am,1.77,1.78

[Sean E. <sea...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
fix for make dist.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- Makefile.am	16 Sep 2002 08:35:13 -0000	1.77
+++ Makefile.am	23 Sep 2002 15:14:37 -0000	1.78
@@ -1,22 +1,12 @@
 SUBDIRS = protocols
-EXTRA_DIST =	ab.xpm				\
-		about_small.xpm			\
+EXTRA_DIST =	about_small.xpm			\
 		add.xpm				\
 		add_small.xpm			\
-		admin_icon.xpm			\
 		angel.xpm			\
 		arrow_down.xpm			\
 		arrow_right.xpm			\
-		aol_icon.xpm			\
-		available-away.xpm		\
-		available-chat.xpm		\
-		available-dnd.xpm		\
-		available-error.xpm		\
-		available-xa.xpm		\
-		available.xpm			\
 		away.png			\
 		away_big.xpm			\
-		away_icon.xpm			\
 		away_small.xpm			\
 		bgcolor.xpm			\
 		big.xpm				\
@@ -33,7 +23,6 @@
 		crazy4.xpm			\
 		crossedlips.xpm			\
 		cry.xpm				\
-		dt_icon.xpm			\
 		download.xpm			\
 		edit.png			\
 		embarrassed.xpm			\
@@ -42,30 +31,17 @@
 		fgcolor.xpm			\
 		fontface.xpm			\
 		fontface2.xpm			\
-		free_icon.xpm			\
 		gaim.png			\
 		gaim_error.png			\
 		gaim_info.png			\
 		gaim_question.png		\
 		gaim_warning.png		\
-		gg_suncloud.xpm			\
-		gg_sunred.xpm			\
-		gg_sunwhitered.xpm		\
-		gg_sunyellow.xpm		\
 		gnome_add.xpm			\
 		gnome_preferences.xpm		\
 		gnome_remove.xpm 		\
-		gnomeicu-away.xpm		\
-		gnomeicu-dnd.xpm		\
-		gnomeicu-ffc.xpm		\
-		gnomeicu-na.xpm			\
-		gnomeicu-occ.xpm		\
-		gnomeicu-offline.xpm		\
-		gnomeicu-online.xpm		\
 		group.xpm			\
 		image_icon.xpm			\
 		import_small.xpm		\
-		irc_icon.xpm			\
 		italic.xpm			\
 		join.xpm			\
 		kiss.xpm			\
@@ -78,10 +54,6 @@
 		moneymouth.xpm			\
 		mrt.xpm				\
 		msgpend.png			\
-		msn_away.xpm			\
-		msn_occ.xpm			\
-		msn_online.xpm			\
-		napster.xpm			\
 		no_icon.xpm			\
 		normal.xpm			\
 		offline.png			\
@@ -121,7 +93,6 @@
 		underline.xpm			\
 		warn.xpm			\
 		wink.xpm			\
-		wireless_icon.xpm		\
 		wood.xpm			\
 		yell.xpm			
 

[Gaim-commits] CVS: gaim/src dialogs.c,1.340,1.341

[Luke S. <lsc...@us...>]

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

Modified Files:
	dialogs.c 
Log Message:
jabber set info crash fix from Ka-Hing Cheung (bsponline)


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -d -r1.340 -r1.341
--- dialogs.c	19 Sep 2002 17:06:18 -0000	1.340
+++ dialogs.c	23 Sep 2002 14:58:06 -0000	1.341
@@ -5071,7 +5071,7 @@
 		gtk_text_set_editable(GTK_TEXT(mtd->textbox), TRUE);
 		gtk_text_set_word_wrap(GTK_TEXT(mtd->textbox), TRUE);
 		gtk_widget_set_usize(mtd->textbox, 300, 100);
-		gtk_text_insert(GTK_TEXT(mtd->textbox), NULL, NULL, NULL, mtd->text, -1);
+		gtk_text_insert(GTK_TEXT(mtd->textbox), NULL, NULL, NULL, mtd->text?mtd->text:"", -1);
 		gtk_box_pack_start(GTK_BOX (hbox), mtd->textbox, FALSE, FALSE, 0);
 		vscrollbar = gtk_vscrollbar_new (GTK_TEXT(mtd->textbox)->vadj);
 		gtk_box_pack_start(GTK_BOX (hbox), vscrollbar, FALSE, FALSE, 0);

[Gaim-commits] CVS: gaim/src gaimrc.c,1.106,1.107 ui.h,1.56,1.57

[Luke S. <lsc...@us...>]

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

Modified Files:
	gaimrc.c ui.h 
Log Message:
after getting possitioning ot work right, robot101 causes gaim's code to not have a couple
variables no longer in use.


Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- gaimrc.c	10 Sep 2002 15:31:34 -0000	1.106
+++ gaimrc.c	23 Sep 2002 03:31:02 -0000	1.107
@@ -784,8 +784,6 @@
 			blist_pos.y = atoi(p->value[1]);
 			blist_pos.width = atoi(p->value[2]);
 			blist_pos.height = atoi(p->value[3]);
-			blist_pos.xoff = atoi(p->value[4]);
-			blist_pos.yoff = atoi(p->value[5]);
 		}
 
 	}
@@ -861,9 +859,8 @@
 	fprintf(f, "\treport_idle { %d }\n", report_idle);
 	fprintf(f, "\tweb_browser { %d }\n", web_browser);
 	fprintf(f, "\tweb_command { %s }\n", web_command);
-	fprintf(f, "\tblist_pos { %d } { %d } { %d } { %d } { %d } { %d }\n",
-		blist_pos.x, blist_pos.y, blist_pos.width, blist_pos.height,
-		blist_pos.xoff, blist_pos.yoff);
+	fprintf(f, "\tblist_pos { %d } { %d } { %d } { %d }\n",
+		blist_pos.x, blist_pos.y, blist_pos.width, blist_pos.height);
 	fprintf(f, "\tconv_size { %d } { %d } { %d }\n",
 		conv_size.width, conv_size.height, conv_size.entry_height);
 	fprintf(f, "\tbuddy_chat_size { %d } { %d } { %d }\n",

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- ui.h	17 Sep 2002 16:43:59 -0000	1.56
+++ ui.h	23 Sep 2002 03:31:02 -0000	1.57
@@ -84,8 +84,6 @@
         int y;
         int width;
         int height;
-	int xoff;
-	int yoff;
 };
 
 struct window_size {

[Gaim-commits] CVS: gaim/src buddy.c,1.333,1.334

[Luke S. <lsc...@us...>]

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

Modified Files:
	buddy.c 
Log Message:
fixed the saving of the buddy list possition and size(thanks robot101)


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -d -r1.333 -r1.334
--- buddy.c	21 Sep 2002 23:55:09 -0000	1.333
+++ buddy.c	23 Sep 2002 01:31:26 -0000	1.334
@@ -2036,12 +2036,9 @@
 void unhide_buddy_list() {
 	if (blist) {
 		gtk_window_present(GTK_WINDOW(blist));
-		if (blist_options & OPT_BLIST_SAVED_WINDOWS) {
-			if (blist_pos.width != 0) {	/* Sanity check! */
-				gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff,
-							 blist_pos.y - blist_pos.yoff);
-				gtk_widget_set_usize(blist, blist_pos.width, blist_pos.height);
-			}
+		if (blist_options & OPT_BLIST_SAVED_WINDOWS && blist_pos.width != 0) {
+			gtk_window_move(GTK_WINDOW(blist), blist_pos.x, blist_pos.y);
+			gtk_window_resize(GTK_WINDOW(blist), blist_pos.width, blist_pos.height);
 		}
 	}
 }
@@ -2448,35 +2445,19 @@
 	}
 }
 
-
-static void move_blist_window(GtkWidget *w, GdkEventConfigure *e, void *dummy)
-{
-	int x, y, width, height;
-	int save = 0;
-	gdk_window_get_position(blist->window, &x, &y);
-	gdk_window_get_size(blist->window, &width, &height);
-
-	if (e->send_event) {	/* Is a position event */
-		if (blist_pos.x != x || blist_pos.y != y)
-			save = 1;
-		blist_pos.x = x;
-		blist_pos.y = y;
-	} else {		/* Is a size event */
-		if (blist_pos.xoff != x || blist_pos.yoff != y || blist_pos.width != width || blist_pos.height != height)
-			save = 1;
-
-		blist_pos.width = width;
-		blist_pos.height = height;
-		blist_pos.xoff = x;
-		blist_pos.yoff = y;
-	}
-
-	if (save)
+static void configure_blist_window(GtkWidget *w, GdkEventConfigure *event, void *data) {
+	if (event->x != blist_pos.x ||
+	    event->y != blist_pos.y ||
+	    event->width != blist_pos.width ||
+	    event->height != blist_pos.height) {
+		blist_pos.x = event->x;
+		blist_pos.y = event->y;
+		blist_pos.width = event->width;
+		blist_pos.height = event->height;
 		save_prefs();
-
+	}
 }
 
-
 /*******************************************************************
  *
  * Helper funs for making the menu
@@ -2671,6 +2652,7 @@
 
 	gtk_widget_realize(blist);
 
+	gtk_window_set_gravity(GTK_WINDOW(blist), GDK_GRAVITY_STATIC);
 	gtk_window_set_policy(GTK_WINDOW(blist), TRUE, TRUE, TRUE);
 
 	accel = gtk_accel_group_new();
@@ -2909,7 +2891,7 @@
 	gtk_signal_connect(GTK_OBJECT(blist), "delete_event", GTK_SIGNAL_FUNC(close_buddy_list),
 			   NULL);
 
-	gtk_signal_connect(GTK_OBJECT(blist), "configure_event", GTK_SIGNAL_FUNC(move_blist_window),
+	gtk_signal_connect(GTK_OBJECT(blist), "configure_event", GTK_SIGNAL_FUNC(configure_blist_window),
 			   NULL);
 
 

[Gaim-commits] Have you read this ???

[<bri...@ya...>]

PGh0bWw+DQo8aGVhZD4NCjx0aXRsZT5XaWxkICZhbXA7IFJlYWR5PC90aXRs
ZT4NCjwvaGVhZD4NCg0KPGJvZHk+DQo8ZGl2IGFsaWduPSJjZW50ZXIiPjxh
IGhyZWY9Imh0dHA6Ly93aWxkMDEuYWR1bHRwb2ludHMuY29tL2VudGVyLmh0
bWw/aWQ9NjgyMzY4Ij48aW1nIHNyYz0iaHR0cDovL3d3dy5hZHVsdHBvaW50
cy5jb20vZnBhcy93aWxkYW5kcmVhZHkvZnBhMDEuanBnIiB3aWR0aD0iNTQw
IiBoZWlnaHQ9IjQwMCIgYm9yZGVyPSIwIj48L2E+IA0KICA8YnI+DQogIDxh
IGhyZWY9Imh0dHA6Ly93aWxkMDEuYWR1bHRwb2ludHMuY29tL2VudGVyLmh0
bWw/aWQ9NjgyMzY4Ij48Zm9udCBjb2xvcj0iIzk5NjZGRiIgc2l6ZT0iNCIg
ZmFjZT0iQXJpYWwsIEhlbHZldGljYSwgc2Fucy1zZXJpZiI+VEhFWSdSRSAN
CiAgV0lMRCAmYW1wOyBSRUFEWSBBTkQgQ0FVR0hUIE9OIENBTUVSQTwvZm9u
dD48L2E+PC9kaXY+DQogIA0KPGJyPg0KPGJyPg0KPGJyPg0KPGJyPg0KPGJy
Pg0KPGJyPg0KPGJyPg0KPGJyPg0KPGJyPg0KPGJyPg0KDQpIZWxsbyBjdXRp
ZS4uIHdoZXJlIGFyZSB5b3UgDQo8YnI+DQo8YnI+DQpUbyB1bnN1YnNjcmli
ZSA6IDxhIGhyZWY9Imh0dHA6Ly9jb2xsZWdlLnVubGltaXRlZC1kb3dubG9h
ZHMuY29tL29wdG91dC5odG1sIj5DbGljayANCmhlcmUgPC9hPg0KPGJyPg0K
PGJyPiA8L2JvZHk+DQo8L2h0bWw+DQoNCjQwMzlTekVtMS0wMTFEaEJyMTA1
MENYbk05LThsMjY=

[Gaim-commits] CVS: gaim/src buddy.c,1.332,1.333

[Luke S. <lsc...@us...>]

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

Modified Files:
	buddy.c 
Log Message:
why did that even compile? unhide_buddy_list; should be unhide_buddy_list();


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- buddy.c	16 Sep 2002 20:42:17 -0000	1.332
+++ buddy.c	21 Sep 2002 23:55:09 -0000	1.333
@@ -2661,7 +2661,7 @@
 	GtkWidget *tbox;
 
 	if (blist) {
-		unhide_buddy_list;
+		unhide_buddy_list();
 		return;
 	}
 

[Gaim-commits] CVS: gaim ChangeLog,1.509.2.29,1.509.2.30

[Sean E. <sea...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	ChangeLog 
Log Message:
Take THAT, color key bindings.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.29
retrieving revision 1.509.2.30
diff -u -d -r1.509.2.29 -r1.509.2.30
--- ChangeLog	15 Sep 2002 20:46:57 -0000	1.509.2.29
+++ ChangeLog	21 Sep 2002 20:03:43 -0000	1.509.2.30
@@ -1,6 +1,7 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
-version 0.59.4:
+version 0.59.4
+	* Removed color keybinnding altogether.
 
 version 0.59.3 (09/14/2002):
 	* Reversed patch that accidentally caused Yahoo

[Gaim-commits] CVS: gaim/src conversation.c,1.358.2.3,1.358.2.4

[Sean E. <sea...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	conversation.c 
Log Message:
Take THAT, color key bindings.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.358.2.3
retrieving revision 1.358.2.4
diff -u -d -r1.358.2.3 -r1.358.2.4
--- conversation.c	14 Sep 2002 16:44:20 -0000	1.358.2.3
+++ conversation.c	21 Sep 2002 20:03:43 -0000	1.358.2.4
@@ -955,13 +955,6 @@
 				toggle_font(c->font, c);
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 				break;
-			case 'k':
-			case 'K':
-				quiet_set(c->fgcolorbtn,
-					  !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->fgcolorbtn)));
-				toggle_fg_color(c->fgcolorbtn, c);
-				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
-				break;
 			}
 		}
 		if (convo_options & OPT_CONVO_CTL_SMILEYS) {

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.96,1.97

[Luke S. <lsc...@us...>]

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

Modified Files:
	msn.c 
Log Message:
compare to _("string") instead of "string" so that comparisons with i18n work


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- msn.c	14 Sep 2002 07:28:10 -0000	1.96
+++ msn.c	21 Sep 2002 17:38:34 -0000	1.97
@@ -1947,17 +1947,17 @@
 	} else if (state) {
 		gc->away = "";
 
-		if (!strcmp(state, "Away From Computer"))
+		if (!strcmp(state, _("Away From Computer")))
 			away = "AWY";
-		else if (!strcmp(state, "Be Right Back"))
+		else if (!strcmp(state, _("Be Right Back")))
 			away = "BRB";
-		else if (!strcmp(state, "Busy"))
+		else if (!strcmp(state, _("Busy")))
 			away = "BSY";
-		else if (!strcmp(state, "On The Phone"))
+		else if (!strcmp(state, _("On The Phone")))
 			away = "PHN";
-		else if (!strcmp(state, "Out To Lunch"))
+		else if (!strcmp(state, _("Out To Lunch")))
 			away = "LUN";
-		else if (!strcmp(state, "Hidden"))
+		else if (!strcmp(state, _("Hidden")))
 			away = "HDN";
 		else {
 			gc->away = NULL;

[Gaim-commits] CVS: gaim/src dialogs.c,1.339,1.340

[Sean E. <sea...@us...>]

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

Modified Files:
	dialogs.c 
Log Message:
I fixed a bug--not the one was reported--just one that I noticed.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -d -r1.339 -r1.340
--- dialogs.c	17 Sep 2002 16:43:59 -0000	1.339
+++ dialogs.c	19 Sep 2002 17:06:18 -0000	1.340
@@ -596,7 +596,7 @@
 		g_free(filename);
 		gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
 	}
-	d = gtk_dialog_new_with_buttons("", NULL, GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
+	d = gtk_dialog_new_with_buttons("", NULL, GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
 	g_signal_connect(d, "response", G_CALLBACK(gtk_widget_destroy), NULL);
 	
 	gtk_container_set_border_width (GTK_CONTAINER(d), 6);

[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.83,1.84

[Sean E. <sea...@us...>]

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

Modified Files:
	irc.c 
Log Message:
crashfix.


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- irc.c	15 Sep 2002 03:40:48 -0000	1.83
+++ irc.c	19 Sep 2002 16:47:17 -0000	1.84
@@ -914,7 +914,7 @@
 			char *errmsg1 = strrchr(text, ':');
 			g_snprintf(errmsg, sizeof(errmsg), "IRC Error %d", n);
 			if (errmsg)
-				do_error_dialog(errmsg, errmsg1+1, GAIM_ERROR);
+				do_error_dialog(errmsg, errmsg1 ? errmsg1+1 : NULL, GAIM_ERROR);
 		}
 		break;
 	}

[Gaim-commits] CVS: gaim/src conversation.c,1.378,1.379

[Sean E. <sea...@us...>]

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

Modified Files:
	conversation.c 
Log Message:
Whoops.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -d -r1.378 -r1.379
--- conversation.c	17 Sep 2002 16:44:00 -0000	1.378
+++ conversation.c	18 Sep 2002 17:06:27 -0000	1.379
@@ -2281,7 +2281,7 @@
 		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), FALSE);
 	state_lock = 0;
 
-	if (c->is_chat) {
+	if (!c->is_chat) {
 		viewer = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 		            			NULL, _("Show Log Viewer"), _("Viewer"),
 						viewer_p, GTK_SIGNAL_FUNC(conv_show_log), GINT_TO_POINTER(c->name));

[Gaim-commits] CVS: gaim/src Makefile.am,1.52,1.53

[Sean E. <sea...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
Sorry, Ben.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- Makefile.am	18 Sep 2002 00:11:44 -0000	1.52
+++ Makefile.am	18 Sep 2002 00:16:12 -0000	1.53
@@ -32,7 +32,7 @@
 gaim_LDFLAGS = -export-dynamic
 gaim_LDADD = @LDADD@ @LIBOBJS@
 
-gaim_LDADD = @LDADD@ @LIBOBJS@
+gaim_remote_LDADD = @LDADD@ @LIBOBJS@
 gaim_remote_SOURCES = gaim-remote.c socket.c
 
 CFLAGS += $(PERL_CFLAGS)

[Gaim-commits] CVS: gaim/src aim.c,1.199,1.200 Makefile.am,1.51,1.52 core.c,1.21,1.22 gaim-remote.c,1.1,1.2

[Sean E. <sea...@us...>]

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

Modified Files:
	aim.c Makefile.am core.c gaim-remote.c 
Log Message:
An automake fix, and a fix for an incredibly blatant Linuxism.


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- aim.c	17 Sep 2002 16:01:55 -0000	1.199
+++ aim.c	18 Sep 2002 00:11:44 -0000	1.200
@@ -481,25 +481,6 @@
 	return TRUE;
 }
 
-static int open_socket(char *name)
-{
-	struct sockaddr_un saddr;
-	gint fd;
-
-	if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) != -1) {
-		saddr.sun_family = AF_UNIX;
-		g_snprintf(saddr.sun_path, 108, "%s", name);
-		if (connect(fd, (struct sockaddr *)&saddr, sizeof(saddr)) != -1)
-			return fd;
-		else
-			debug_printf("Failed to assign %s to a socket (Error: %s)\n",
-					saddr.sun_path, strerror(errno));
-	} else
-		debug_printf("Unable to open socket: %s\n", strerror(errno));
-	close(fd);
-	return -1;
-}
-
 static int ui_main()
 {
 	GIOChannel *channel;
@@ -520,7 +501,7 @@
 
 	g_snprintf(name, sizeof(name), "%s/gaim_%s.%d", g_get_tmp_dir(), g_get_user_name(), gaim_session);
 
-	UI_fd = open_socket(name);
+	UI_fd = gaim_connect_to_session(0);
 	if (UI_fd < 0)
 		return 1;
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Makefile.am	30 Aug 2002 20:57:22 -0000	1.51
+++ Makefile.am	18 Sep 2002 00:11:44 -0000	1.52
@@ -32,6 +32,7 @@
 gaim_LDFLAGS = -export-dynamic
 gaim_LDADD = @LDADD@ @LIBOBJS@
 
+gaim_LDADD = @LDADD@ @LIBOBJS@
 gaim_remote_SOURCES = gaim-remote.c socket.c
 
 CFLAGS += $(PERL_CFLAGS)

Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- core.c	30 Aug 2002 16:09:22 -0000	1.21
+++ core.c	18 Sep 2002 00:11:45 -0000	1.22
@@ -443,7 +443,7 @@
 	if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) != -1) {
 		mode_t m = umask(0177);
 		saddr.sun_family = AF_UNIX;
-		g_snprintf(saddr.sun_path, 108, "%s/gaim_%s.%d",
+		g_snprintf(saddr.sun_path, sizeof(saddr.sun_path), "%s/gaim_%s.%d",
 			   g_get_tmp_dir(), g_get_user_name(), gaim_session);
 		if (bind(fd, (struct sockaddr *)&saddr, sizeof(saddr)) != -1)
 			listen(fd, 100);

Index: gaim-remote.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim-remote.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gaim-remote.c	30 Aug 2002 16:28:00 -0000	1.1
+++ gaim-remote.c	18 Sep 2002 00:11:45 -0000	1.2
@@ -20,7 +20,7 @@
  */
 
 #include "gaim.h"
-#include "getopt.h"
+#include <getopt.h>
 #include "gaim-socket.h"
 
 void show_remote_usage(char *name) 

[Gaim-commits] CVS: gaim/src dialogs.c,1.338,1.339 ui.h,1.55,1.56 conversation.c,1.377,1.378

[Sean E. <sea...@us...>]

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

Modified Files:
	dialogs.c ui.h conversation.c 
Log Message:
log viewer works on chats now.  neat.  Thanks javabsp.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -d -r1.338 -r1.339
--- dialogs.c	16 Sep 2002 19:50:52 -0000	1.338
+++ dialogs.c	17 Sep 2002 16:43:59 -0000	1.339
@@ -4107,6 +4107,13 @@
 	g_free(name);
 }
 
+void chat_show_log(GtkWidget *w, gpointer data)
+{
+	char *name = g_strdup_printf("%s.chat", data);
+	show_log(name);
+	g_free(name);
+}
+
 void show_log(char *nm)
 {
 	gchar filename[256];

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- ui.h	16 Sep 2002 20:42:17 -0000	1.55
+++ ui.h	17 Sep 2002 16:43:59 -0000	1.56
@@ -430,6 +430,7 @@
 extern void show_export_dialog();
 extern void show_new_bp(char *, struct gaim_connection *, int, int, struct buddy_pounce *);
 extern void conv_show_log(GtkWidget *, gpointer);
+extern void chat_show_log(GtkWidget *, gpointer);
 extern void show_log(char *);
 extern void show_log_dialog(struct conversation *);
 extern void show_fgcolor_dialog(struct conversation *c, GtkWidget *color);

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -d -r1.377 -r1.378
--- conversation.c	16 Sep 2002 08:35:20 -0000	1.377
+++ conversation.c	17 Sep 2002 16:44:00 -0000	1.378
@@ -2281,10 +2281,16 @@
 		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), FALSE);
 	state_lock = 0;
 
-	viewer = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-							NULL, _("Show Log Viewer"), _("Viewer"),
-              viewer_p, GTK_SIGNAL_FUNC(conv_show_log), GINT_TO_POINTER(c->name));
-
+	if (c->is_chat) {
+		viewer = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+		            			NULL, _("Show Log Viewer"), _("Viewer"),
+						viewer_p, GTK_SIGNAL_FUNC(conv_show_log), GINT_TO_POINTER(c->name));
+	} else {
+		viewer = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+						NULL, _("Show Log Viewer"), _("Viewer"),
+        					viewer_p, GTK_SIGNAL_FUNC(chat_show_log), GINT_TO_POINTER(c->name));
+	}
+	
 	save = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 				       NULL, _("Save Conversation"),
 				       _("Save"), save_p, GTK_SIGNAL_FUNC(save_convo), c);

[Gaim-commits] CVS: gaim/src aim.c,1.198,1.199

[Sean E. <sea...@us...>]

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

Modified Files:
	aim.c 
Log Message:
Thanks Jeong-Hee Kang.

NLS translations will get converted to UTF-8 (for recent versions of glibc)
so that GTK2 will be able to display them properly.


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- aim.c	17 Sep 2002 04:39:09 -0000	1.198
+++ aim.c	17 Sep 2002 16:01:55 -0000	1.199
@@ -579,6 +579,7 @@
 
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset(PACKAGE, "UTF-8");
 	textdomain(PACKAGE);
 #endif
 

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.43.2.4,1.43.2.5

[Sean E. <sea...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	yahoo.c 
Log Message:
Yesterday's Yahoo leak fix.


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.43.2.4
retrieving revision 1.43.2.5
diff -u -d -r1.43.2.4 -r1.43.2.5
--- yahoo.c	14 Sep 2002 07:32:50 -0000	1.43.2.4
+++ yahoo.c	17 Sep 2002 15:56:28 -0000	1.43.2.5
@@ -823,7 +823,9 @@
 		yahoo_packet_hash(pack, 1, gc->username);
 		
 		yahoo_send_packet(yd, pack);
-		
+	
+		g_free(result6);
+		g_free(result96);
 		g_free(password_hash);
 		g_free(crypt_hash);
 		g_free(hash_string_p);

[Gaim-commits] CVS: gaim/src util.c,1.133,1.134

[Sean E. <sea...@us...>]

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

Modified Files:
	util.c 
Log Message:
a gaim-remote fix and a gaim -h update.

Thanks, John Silvestri.


Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- util.c	30 Aug 2002 16:20:40 -0000	1.133
+++ util.c	17 Sep 2002 15:40:28 -0000	1.134
@@ -779,6 +779,7 @@
 		       "                      name of away message to use)\n"
 		       "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 		       "                      account(s) to use)\n"
+		       "  -n, --loginwin      don't automatically login; show login window\n"
 		       "  -u, --user=NAME     use account NAME\n"
 		       "  -f, --file=FILE     use FILE as config\n"
 		       "  -d, --debug         print debugging messages to stdout\n"
@@ -1319,6 +1320,7 @@
 		}
 		
 		c = new_conversation(who);
+		set_convo_gc(c, gc);
 		g_free(who);
 		if (what) {
 			int finish;

[Gaim-commits] CVS: gaim gaim.spec.in,1.55,1.56

[Sean E. <sea...@us...>]

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

Modified Files:
	gaim.spec.in 
Log Message:
Thanks Caleb Land.


Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- gaim.spec.in	26 Aug 2002 02:33:38 -0000	1.55
+++ gaim.spec.in	17 Sep 2002 15:34:13 -0000	1.56
@@ -48,11 +48,17 @@
 %files
 %defattr(-,root,root)
 %{prefix}/bin/gaim
+%{prefix}/bin/gaim-remote
 %doc doc/the_penguin.txt doc/CREDITS NEWS COPYING AUTHORS doc/FAQ README ChangeLog plugins/PERL-HOWTO HACKING
 %{prefix}/man/man1/gaim.1.gz
 %attr(755,root,root) %{prefix}/lib/gaim/*
 %{prefix}/share/locale/*/*/*
 %{prefix}/share/pixmaps/gaim.png
+%{prefix}/share/pixmaps/gaim/*
+%{prefix}/share/pixmaps/gaim/dialogs/*
+%{prefix}/share/pixmaps/gaim/dialogs/*
+%{prefix}/share/pixmaps/gaim/buttons/*
+
 %{prefix}/share/gnome/apps/Internet/gaim.desktop
 
 %clean

[Gaim-commits] CVS: gaim/src aim.c,1.197,1.198

[Sean E. <sea...@us...>]

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

Modified Files:
	aim.c 
Log Message:
How'd that get there? =-O


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- aim.c	16 Sep 2002 21:40:11 -0000	1.197
+++ aim.c	17 Sep 2002 04:39:09 -0000	1.198
@@ -411,7 +411,7 @@
 			"they can help you.\n");
 #else
 		fprintf(stderr, "Oh no!  Segmentation fault!\n");
-		g_on_error_query (prog_name);
+		g_on_error_query (g_get_prgname());
 		exit(1);
 #endif
 		abort();

[Gaim-commits] CVS: gaim/src gaim.h,1.337,1.338

[Luke S. <lsc...@us...>]

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

Modified Files:
	gaim.h 
Log Message:
6 does not convert cleanly to base 2. as a result, you cannot use 60 as a option
this makes it use 80 instead. much better.


Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -d -r1.337 -r1.338
--- gaim.h	16 Sep 2002 08:35:21 -0000	1.337
+++ gaim.h	17 Sep 2002 02:56:40 -0000	1.338
@@ -333,7 +333,7 @@
 #define OPT_AWAY_NO_AUTO_RESP		0x00000010
 #define OPT_AWAY_QUEUE			0x00000020
 #define OPT_AWAY_IDLE_RESP		0x00000040
-#define OPT_AWAY_QUEUE_UNREAD           0x00000060
+#define OPT_AWAY_QUEUE_UNREAD           0x00000080
 
 extern guint away_resend;
 extern int report_idle;

[Gaim-commits] CVS: gaim/src prefs.c,1.252,1.253

[Luke S. <lsc...@us...>]

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

Modified Files:
	prefs.c 
Log Message:
this should fix a segfault on signing off (or maybe at other random times)(thanks robot101)


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- prefs.c	16 Sep 2002 18:14:39 -0000	1.252
+++ prefs.c	17 Sep 2002 01:48:59 -0000	1.253
@@ -105,7 +105,8 @@
 	}
 	sound_entry = NULL;
 	browser_entry = NULL;
-	debugbutton=NULL;
+	debugbutton = NULL;
+	prefs_away_menu = NULL;
 	if(sounddialog)
 		gtk_widget_destroy(sounddialog);
 	g_object_unref(G_OBJECT(prefs_away_store));