changeset 28199:89f9e7c65365

merge of '143f0731ba083b48ae06f957fa8ae2ae4d3a9edb' and 'a264bb34c8bb53aea40fe09255b897fdaefb1311'

--- a/ChangeLog	Fri Sep 04 04:43:37 2009 +0000
+++ b/ChangeLog	Fri Sep 04 05:22:36 2009 +0000
@@ -47,6 +47,8 @@
 	* Fix the auto-personize functionality in the Buddy List.
 	* Set the window icon for the media window to an icon corresponding to
 	  the type of call (headphone or webcam).
+	* Customized sound files are no longer reset whenever opening the
+	  Preferences dialog.
 
 version 2.6.1 (08/18/2009):
 	* Fix a crash when some users send you a link in a Yahoo IM

--- a/pidgin/gtkprefs.c	Fri Sep 04 04:43:37 2009 +0000
+++ b/pidgin/gtkprefs.c	Fri Sep 04 05:22:36 2009 +0000
@@ -91,6 +91,8 @@
 static GtkWidget *prefs_blist_themes_combo_box;
 static GtkWidget *prefs_status_themes_combo_box;
 
+static gboolean prefs_sound_themes_loading;
+
 /*
  * PROTOTYPES
  */
@@ -580,6 +582,7 @@
 	gchar *filename;
 	GtkTreeIter iter;
 
+	prefs_sound_themes_loading = TRUE;
 	/* refresh the list of themes in the manager */
 	purple_theme_manager_refresh();
 
@@ -614,6 +617,7 @@
 	prefs_set_active_theme_combo(prefs_sound_themes_combo_box, prefs_sound_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme"));
 	prefs_set_active_theme_combo(prefs_blist_themes_combo_box, prefs_blist_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/theme"));
 	prefs_set_active_theme_combo(prefs_status_themes_combo_box, prefs_status_icon_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/status/icon-theme"));
+	prefs_sound_themes_loading = FALSE;
 }
 
 /* init all the theme variables so that the themes can be sorted later and used by pref pages */
@@ -930,7 +934,11 @@
 {
 	GtkCellRenderer *cell_rend;
 	GtkWidget *combo_box;
-	GtkTargetEntry te[3] = {{"text/plain", 0, 0},{"text/uri-list", 0, 1},{"STRING", 0, 2}};
+	GtkTargetEntry te[3] = {
+		{"text/plain", 0, 0},
+		{"text/uri-list", 0, 1},
+		{"STRING", 0, 2}
+	};
 
 	g_return_val_if_fail(store != NULL && current_theme != NULL, NULL);
 
@@ -965,7 +973,7 @@
 	gchar *new_theme;
 	GtkTreeIter new_iter;
 
-	if(gtk_combo_box_get_active_iter(combo_box, &new_iter)) {
+	if(gtk_combo_box_get_active_iter(combo_box, &new_iter) && !prefs_sound_themes_loading) {
 
 		gtk_tree_model_get(GTK_TREE_MODEL(prefs_sound_themes), &new_iter, 2, &new_theme, -1);
 
@@ -1086,12 +1094,17 @@
 	GtkTreeSelection *sel;
 	GtkTreeRowReference *rowref;
 	GtkWidget *label;
-	GtkTargetEntry te[3] = {{"text/plain", 0, 0},{"text/uri-list", 0, 1},{"STRING", 0, 2}};
+	GtkTargetEntry te[3] = {
+		{"text/plain", 0, 0},
+		{"text/uri-list", 0, 1},
+		{"STRING", 0, 2}
+	};
 
 	ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
 	gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER);
 
-	label = gtk_label_new(_("Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."));
+	label = gtk_label_new(_("Select a smiley theme that you would like to use from the list below."
+	                        " New themes can be installed by dragging and dropping them onto the theme list."));
 
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -1877,14 +1890,14 @@
 			G_CALLBACK(network_turn_server_changed_cb), NULL);
 	gtk_widget_show(entry);
 
-	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), "_TURN server:",
+	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_TURN server:"),
 			sg, entry, TRUE, NULL);
 
 	pidgin_prefs_labeled_spin_button(hbox, _("_Port:"),
 		"/purple/network/turn_port", 0, 65535, NULL);
-	hbox = pidgin_prefs_labeled_entry(vbox, "_Username:",
+	hbox = pidgin_prefs_labeled_entry(vbox, _("_Username:"),
 		"/purple/network/turn_username", sg);
-	pidgin_prefs_labeled_password(hbox, "_Password:",
+	pidgin_prefs_labeled_password(hbox, _("_Password:"),
 		"/purple/network/turn_password", NULL);
 
 	if (purple_running_gnome()) {

--- a/po/check_po.pl	Fri Sep 04 04:43:37 2009 +0000
+++ b/po/check_po.pl	Fri Sep 04 05:22:36 2009 +0000
@@ -361,7 +361,7 @@
         $state = S_DOING_MSGSTR;
         next LINE;
     }
-    if ( m(^msgstr\[[0-2]\] \"(.*)\"$) ) {
+    if ( m(^msgstr\[[0-5]\] \"(.*)\"$) ) {
         @amsgstr = ($1);
         $state = S_DOING_MSGSTR;
         next LINE;

--- a/po/sq.po	Fri Sep 04 04:43:37 2009 +0000
+++ b/po/sq.po	Fri Sep 04 05:22:36 2009 +0000
@@ -11054,7 +11054,7 @@
 #: ../libpurple/protocols/qq/group_opt.c:522
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr "<b>Pjesëmarrja në Qun %u për %s është miratuar nga përgjegjësi %u</b>"
+msgstr "<b>Pjesëmarrja në Qun %u është miratuar nga Përgjegjësi %u për %s</b>"
 
 #: ../libpurple/protocols/qq/group_opt.c:557
 #, c-format