Pidgin

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4807/src

Modified Files:
	gtkdialogs.c 
Log Message:
Alphabetize Mono and Perl in the list of features.

Index: gtkdialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkdialogs.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -p -r1.80 -r1.81
--- gtkdialogs.c	17 Nov 2005 03:38:38 -0000	1.80
+++ gtkdialogs.c	17 Nov 2005 17:38:07 -0000	1.81
@@ -391,30 +391,30 @@ g_string_append(str, "<br/>  <b>Library 
 	g_string_append(str, "    <b>libao:</b> Disabled<br/>");
 #endif
 
-#ifdef HAVE_NSS
-	g_string_append(str, "    <b>Network Security Services (NSS):</b> Enabled<br/>");
-#else
-	g_string_append(str, "    <b>Network Security Services (NSS):</b> Disabled<br/>");
-#endif
-
-#ifdef HAVE_STARTUP_NOTIFICATION
-	g_string_append(str, "    <b>Startup Notification:</b> Enabled<br/>");
-#else
-	g_string_append(str, "    <b>Startup Notification:</b> Disabled<br/>");
-#endif
-
 #ifdef ENABLE_MONO
 	g_string_append(str, "    <b>Mono:</b> Enabled<br/>");
 #else
 	g_string_append(str, "    <b>Mono:</b> Disabled<br/>");
 #endif
 
+#ifdef HAVE_NSS
+	g_string_append(str, "    <b>Network Security Services (NSS):</b> Enabled<br/>");
+#else
+	g_string_append(str, "    <b>Network Security Services (NSS):</b> Disabled<br/>");
+#endif
+
 #ifdef HAVE_PERL
 	g_string_append(str, "    <b>Perl:</b> Enabled<br/>");
 #else
 	g_string_append(str, "    <b>Perl:</b> Disabled<br/>");
 #endif
 
+#ifdef HAVE_STARTUP_NOTIFICATION
+	g_string_append(str, "    <b>Startup Notification:</b> Enabled<br/>");
+#else
+	g_string_append(str, "    <b>Startup Notification:</b> Disabled<br/>");
+#endif
+
 #ifdef HAVE_TCL
 	g_string_append(str, "    <b>Tcl:</b> Enabled<br/>");
 #else

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29375

Modified Files:
	gtkaccount.c 
Log Message:
When adding a new account, set the status before enabling it.That way, the correct status ends up being used, and you don't run into a a weird situation where the account tries to connect and then the offline status is appled when your current status is 'Offline'. Also a warning fix.

Index: gtkaccount.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -p -r1.207 -r1.208
--- gtkaccount.c	15 Nov 2005 08:42:03 -0000	1.207
+++ gtkaccount.c	17 Nov 2005 04:42:16 -0000	1.208
@@ -965,8 +965,8 @@ add_protocol_options(AccountPrefsDialog 
 	GtkWidget *check;
 	GtkWidget *entry;
 	GtkWidget *combo;
-	GList *list;
-	GList *node;
+	const GList *list;
+	const GList *node;
 	gint i, idx;
 	GtkListStore *model;
 	GtkTreeIter iter;
@@ -1623,12 +1623,16 @@ ok_account_prefs_cb(GtkWidget *w, Accoun
 	/* If this is a new account, then sign on! */
 	if (new) {
 		const char *current_savedstatus_name;
-		const GaimSavedStatus *saved_status;
+		const GaimSavedStatus *saved_status = NULL;
 
-		gaim_account_set_enabled(account, GAIM_GTK_UI, TRUE);
 		current_savedstatus_name = gaim_prefs_get_string("/core/status/current");
-		saved_status = gaim_savedstatus_find(current_savedstatus_name);
-		gaim_savedstatus_activate_for_account(saved_status, account);
+		if (current_savedstatus_name)
+			saved_status = gaim_savedstatus_find(current_savedstatus_name);
+
+		if (saved_status) {
+			gaim_savedstatus_activate_for_account(saved_status, account);
+			gaim_account_set_enabled(account, GAIM_GTK_UI, TRUE);
+		}
 	}
 
 	return account;
@@ -2339,7 +2343,7 @@ account_treeview_double_click_cb(GtkTree
 	gtk_tree_model_get(GTK_TREE_MODEL(dialog->model), &iter, COLUMN_DATA, &account, -1);
 
 	if ((account != NULL) && (event->button == 1) &&
-		(event->type == GDK_2BUTTON_PRESS) && 
+		(event->type == GDK_2BUTTON_PRESS) &&
 		(strcmp(gtk_tree_view_column_get_title(column), title)))
 	{
 		gaim_gtk_account_dialog_show(GAIM_GTK_MODIFY_ACCOUNT_DIALOG, account);

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18459/src

Modified Files:
	gtkdialogs.c 
Log Message:
Perl and Mono should probably be listed in the About box as enabled/disabled.


Index: gtkdialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkdialogs.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -p -r1.79 -r1.80
--- gtkdialogs.c	16 Nov 2005 18:17:01 -0000	1.79
+++ gtkdialogs.c	17 Nov 2005 03:38:38 -0000	1.80
@@ -403,6 +403,18 @@ g_string_append(str, "<br/>  <b>Library 
 	g_string_append(str, "    <b>Startup Notification:</b> Disabled<br/>");
 #endif
 
+#ifdef ENABLE_MONO
+	g_string_append(str, "    <b>Mono:</b> Enabled<br/>");
+#else
+	g_string_append(str, "    <b>Mono:</b> Disabled<br/>");
+#endif
+
+#ifdef HAVE_PERL
+	g_string_append(str, "    <b>Perl:</b> Enabled<br/>");
+#else
+	g_string_append(str, "    <b>Perl:</b> Disabled<br/>");
+#endif
+
 #ifdef HAVE_TCL
 	g_string_append(str, "    <b>Tcl:</b> Enabled<br/>");
 #else

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18459

Modified Files:
	configure.ac 
Log Message:
Perl and Mono should probably be listed in the About box as enabled/disabled.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -d -p -r1.341 -r1.342
--- configure.ac	13 Nov 2005 01:44:11 -0000	1.341
+++ configure.ac	17 Nov 2005 03:38:37 -0000	1.342
@@ -726,7 +726,8 @@ if test "$enable_perl" = yes ; then
 	else
 		AC_SUBST(PERL_CFLAGS)
 		AC_SUBST(PERL_LIBS)
-		AM_CONDITIONAL(USE_PERL, test "x$enable_perl" = "xyes")
+		AM_CONDITIONAL(USE_PERL, true)
+		AC_DEFINE(HAVE_PERL, [1], [Compile with support for perl])
 
 		dnl This is almost definitely wrong, but in case there's
 		dnl something I'm missing, I'll leave it in.

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10715/src

Modified Files:
	gtkblist.c connection.c 
Log Message:
Let's try this modification to charkins latest visibility_manager change.

I moved the restore_position and show_all calls into the blist_show function,
since I really don't think we need to be showing and then iconifying the
blist everytime we set_visible gets called without a visibility manager.

I removed the gaim_blist_show call from connection.c that was causing the
blist window to be re-shown when an account connected. I think this was either
a remnant of the blist raise on events pref or a remnant from when we had a
Login screen. I don't think we need it anymore, someone let me know if this
breaks things. I also removed what I believe was the visibility_manager check
that was added to work around the annoyance this was causing.


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -p -r1.319 -r1.320
--- gtkblist.c	16 Nov 2005 22:33:15 -0000	1.319
+++ gtkblist.c	17 Nov 2005 00:11:53 -0000	1.320
@@ -3344,8 +3344,7 @@ static void gaim_gtk_blist_show(GaimBudd
 				{"application/x-im-contact", 0, DRAG_BUDDY},
 				{"text/x-vcard", 0, DRAG_VCARD }};
 	if (gtkblist && gtkblist->window) {
-		if(!GTK_WIDGET_VISIBLE(gtkblist->window))
-			gaim_blist_set_visible(gaim_prefs_get_bool("/gaim/gtk/blist/list_visible"));
+		gaim_blist_set_visible(gaim_prefs_get_bool("/gaim/gtk/blist/list_visible"));
 		return;
 	}
 
@@ -3532,6 +3531,8 @@ static void gaim_gtk_blist_show(GaimBudd
 
 	/* OK... let's show this bad boy. */
 	gaim_gtk_blist_refresh(list);
+	gaim_gtk_blist_restore_position();
+	gtk_widget_show_all(GTK_WIDGET(gtkblist->window));
 	gaim_blist_set_visible(gaim_prefs_get_bool("/gaim/gtk/blist/list_visible"));
 
 	/* start the refresh timer */
@@ -4071,8 +4072,6 @@ static void gaim_gtk_blist_set_visible(G
 			gaim_signal_emit(gaim_gtk_blist_get_handle(), "gtkblist-hiding", gtkblist);
 			gtk_widget_hide(gtkblist->window);
 		} else {
-			gaim_gtk_blist_restore_position();
-			gtk_widget_show_all(GTK_WIDGET(gtkblist->window));
 			gtk_window_iconify(GTK_WINDOW(gtkblist->window));
 		}
 	}

Index: connection.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -p -r1.100 -r1.101
--- connection.c	14 Nov 2005 22:46:16 -0000	1.100
+++ connection.c	17 Nov 2005 00:11:53 -0000	1.101
@@ -289,7 +289,6 @@ gaim_connection_set_state(GaimConnection
 		if (ops != NULL && ops->connected != NULL)
 			ops->connected(gc);
 
-		gaim_blist_show();
 		gaim_blist_add_account(account);
 
 		/*