Mercurial > pidgin.yaz

changeset 32554:a6d6b0867cd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Inform the user about how the theme change takes effect.
author tdrhq@soc.pidgin.im
date Mon, 10 Aug 2009 17:45:16 +0000
parents c5d6befd0765
children d1ed820fa416
files pidgin/plugins/adiumthemes/webkit.c
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/plugins/adiumthemes/webkit.c	Mon Aug 10 10:34:52 2009 +0000
+++ b/pidgin/plugins/adiumthemes/webkit.c	Mon Aug 10 17:45:16 2009 +0000
@@ -809,9 +809,16 @@
 style_changed (GtkWidget* combobox, gpointer null)
 {
 	char *name = gtk_combo_box_get_active_text (GTK_COMBO_BOX(combobox));
+	GtkWidget *dialog;
 
 	g_free (cur_style_dir);
 	cur_style_dir = name;
+
+	/* inform the user that existing conversations haven't changed */
+	dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "The style for existing conversations have not been changed. Please close and re-open the conversation for the changes to take effect.");
+	g_assert (dialog);
+	gtk_widget_show (dialog);
+	g_signal_connect_swapped (dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog);
 }
 
 static GtkWidget*
@@ -821,13 +828,14 @@
 	GList *styles = get_style_directory_list (), *iter;
 	int index = 0, selected = 0;
 
-	for (iter = styles; iter; iter = g_list_next (iter), index++) {
+	for (iter = styles; iter; iter = g_list_next (iter)) {
 		PidginMessageStyle *style = pidgin_message_style_load (iter->data);
 		
 		if (style) {
 			gtk_combo_box_append_text (GTK_COMBO_BOX(combobox), iter->data);
 			if (g_str_equal (iter->data, cur_style_dir))
 				selected = index;
+			index++;
 			pidgin_message_style_unref (style);
 		}
 	}