changeset 4778:85c6c3a60503

[gaim-migrate @ 5098] It helps when you commit stuff committer: Tailor Script <[e-mail]>

--- a/src/dialogs.c	Fri Mar 14 22:49:32 2003 +0000
+++ b/src/dialogs.c	Fri Mar 14 22:59:58 2003 +0000
@@ -493,7 +493,7 @@
 		g_free(filename);
 		gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
 	}
-	d = gtk_dialog_new_with_buttons("Gaim", NULL, 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+	d = gtk_dialog_new_with_buttons("", NULL, 0, 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);

--- a/src/multi.c	Fri Mar 14 22:49:32 2003 +0000
+++ b/src/multi.c	Fri Mar 14 22:59:58 2003 +0000
@@ -1209,7 +1209,7 @@
 	p->account = account;
 	passes = g_slist_append(passes, p);
 
-	p->win = gtk_dialog_new_with_buttons("Gaim", NULL, 0, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+	p->win = gtk_dialog_new_with_buttons("", NULL, 0, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 						_("_Login"), GTK_RESPONSE_YES, NULL);
 
 	gtk_dialog_set_default_response (GTK_DIALOG(p->win), GTK_RESPONSE_YES);

--- a/src/protocols/oscar/oscar.c	Fri Mar 14 22:49:32 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Fri Mar 14 22:59:58 2003 +0000
@@ -4380,6 +4380,7 @@
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
 	struct aim_ssi_item *curitem;
 	int tmp;
+	gboolean export = FALSE;
 	/* XXX - use these?
 	va_list ap;
 
@@ -4393,10 +4394,9 @@
 	debug_printf("ssi: syncing local list and server list\n");
 
 	/* Clean the buddy list */
-	aim_ssi_cleanlist(sess, fr->conn);
+	/* aim_ssi_cleanlist(sess, fr->conn); */
 
 	/* Add from server list to local list */
-	tmp = 0;
 	for (curitem=sess->ssi.local; curitem; curitem=curitem->next) {
 		switch (curitem->type) {
 			case 0x0000: { /* Buddy */
@@ -4426,7 +4426,7 @@
 						
 						debug_printf("ssi: adding buddy %s to group %s to local list\n", curitem->name, gname);
 						gaim_blist_add_buddy(buddy, g, NULL);
-						tmp++;
+						export = TRUE;
 					}
 					free(gname_utf8);
 					free(alias_utf8);
@@ -4446,7 +4446,7 @@
 						debug_printf("ssi: adding permit buddy %s to local list\n", curitem->name);
 						gaim_privacy_permit_add(gc->account, curitem->name);
 						build_allow_list();
-						tmp++;
+						export = TRUE;
 					}
 				}
 			} break;
@@ -4459,7 +4459,7 @@
 						debug_printf("ssi: adding deny buddy %s to local list\n", curitem->name);
 						gaim_privacy_deny_add(gc->account, curitem->name);
 						build_block_list();
-						tmp++;
+						export = TRUE;
 					}
 				}
 			} break;
@@ -4473,7 +4473,7 @@
 						if (od->icq && gc->account->permdeny == 0x03) {
 							serv_set_away(gc, "Invisible", "");
 						}
-						tmp++;
+						export = TRUE;
 					}
 				}
 			} break;
@@ -4485,7 +4485,7 @@
 	} /* End of for loop */
 
 	/* If changes were made, then flush buddy list to file */
-	if (tmp)
+	if (export)
 		gaim_blist_save();
 
 	{ /* Add from local list to server list */
@@ -4493,7 +4493,6 @@
 		struct group *group;
 		struct buddy *buddy;
 		struct gaim_buddy_list *blist;
-		GSList *groups = gaim_blist_groups();
 		GSList *cur;
 
 		/* Buddies */
@@ -4544,8 +4543,10 @@
 		if ((tmp = aim_ssi_getpresence(sess->ssi.local)) != 0xFFFFFFFF)
 			if (report_idle && !(tmp & 0x400))
 				aim_ssi_setpresence(sess, fr->conn, tmp | 0x400);
-
-		/* Check for maximum number of buddies */
+	} /* end adding buddies from local list to server list */
+
+	{ /* Check for maximum number of buddies */
+		GSList *groups = gaim_blist_groups(), *cur;
 		for (cur=groups, tmp=0; cur; cur=g_slist_next(cur)) {
 			struct group* gr = (struct group*)cur->data;
 			GSList *buds = gaim_blist_members(gr);
@@ -4567,9 +4568,8 @@
 			do_error_dialog(_("Maximum buddy list length exceeded."), dialog_msg, GAIM_WARNING);
 			g_free(dialog_msg);
 		}
+	}
 		
-	} /* end adding buddies from local list to server list */
-
 	/* Activate SSI */
 	/* Sending the enable causes other people to be able to see you, and you to see them */
 	/* Make sure your privacy setting/invisibility is set how you want it before this! */

--- a/src/prpl.c	Fri Mar 14 22:49:32 2003 +0000
+++ b/src/prpl.c	Fri Mar 14 22:59:58 2003 +0000
@@ -211,7 +211,7 @@
 	STOCK_ITEMIZE("Yes", GTK_STOCK_YES);
 	STOCK_ITEMIZE("No", GTK_STOCK_NO);
 
-	window = gtk_dialog_new_with_buttons("Gaim", NULL, 0, notext, GTK_RESPONSE_NO, yestext, GTK_RESPONSE_YES, NULL);
+	window = gtk_dialog_new_with_buttons("", NULL, 0, notext, GTK_RESPONSE_NO, yestext, GTK_RESPONSE_YES, NULL);
 
 	if (modal) {
 		gtk_window_set_modal(GTK_WINDOW(window), TRUE);