pidgin.yaz: src/gtkprefs.c comparison

comparison src/gtkprefs.c @ 11557:1e7c0773380f

[gaim-migrate @ 13819] Fix smiley theme selection being lost when gaim is restarted. We now save the smiley theme name instead of path as the pref. Avoid leaking a GtkTreeRowReference. committer: Tailor Script <tailor@pidgin.im>

author	Daniel Atallah <daniel.atallah@gmail.com>
date	Tue, 20 Sep 2005 21:47:57 +0000
parents	ec2335d98b83
children	9b3833da6840

comparison

equal deleted inserted replaced

-:7fbf5e4e8f5f
+:1e7c0773380f
 static GtkWidget *prefs = NULL;
 static GtkWidget *debugbutton = NULL;
 static int notebook_page = 0;
 static GtkTreeIter plugin_iter;
-GtkTreeRowReference *previous_smiley_row;
+static GtkTreeRowReference *previous_smiley_row = NULL;
 /*
 * PROTOTYPES
 */
 static int prefs_notebook_add_page(const char*, GdkPixbuf*,
 	prefs = NULL;
 	sound_entry = NULL;
 	debugbutton = NULL;
 	notebook_page = 0;
 	smiley_theme_store = NULL;
+	if (previous_smiley_row)
+		gtk_tree_row_reference_free(previous_smiley_row);
+	previous_smiley_row = NULL;
 	for (l = gaim_plugins_get_loaded(); l != NULL; l = l->next)
 	{
 		delete_plugin_prefs(l->data);
 	}
 }
-static void smiley_sel (GtkTreeSelection *sel, GtkTreeModel *model) {
+static void smiley_sel(GtkTreeSelection *sel, GtkTreeModel *model) {
 	GtkTreeIter  iter;
-	const char *filename;
+	const char *themename;
-	char	*description;
+	char *description;
 	GValue val = { 0, };
-	GtkTreePath	*path,
+	GtkTreePath *path, *oldpath;
-				*oldpath;
+	struct smiley_theme *new_theme, *old_theme;
-	struct smiley_theme	*new_theme,
-						*old_theme;
+	if (!gtk_tree_selection_get_selected(sel, &model, &iter))
-	if (! gtk_tree_selection_get_selected (sel, &model, &iter))
 		return;
 	old_theme = current_smiley_theme;
-	gtk_tree_model_get_value (model, &iter, 2, &val);
+	gtk_tree_model_get_value(model, &iter, 3, &val);
 	path = gtk_tree_model_get_path(model, &iter);
-	filename = g_value_get_string(&val);
+	themename = g_value_get_string(&val);
-	gaim_prefs_set_string("/gaim/gtk/smileys/theme", filename);
+	gaim_prefs_set_string("/gaim/gtk/smileys/theme", themename);
 	g_value_unset (&val);
+	/* current_smiley_theme is set in callback for the above pref change */
 	new_theme = current_smiley_theme;
 	description = g_strdup_printf("<span size='larger' weight='bold'>%s</span> - %s\n"
 								"<span size='smaller' foreground='white'>%s</span>",
 								new_theme->name, new_theme->author, new_theme->desc);
-	gtk_list_store_set(smiley_theme_store,&iter,1,description,-1);
+	gtk_list_store_set(smiley_theme_store, &iter, 1, description, -1);
 	g_free(description);
-	oldpath = gtk_tree_row_reference_get_path(previous_smiley_row);
+	if (new_theme != old_theme && previous_smiley_row) {
-	if(gtk_tree_model_get_iter(model, &iter, oldpath)){
+		oldpath = gtk_tree_row_reference_get_path(previous_smiley_row);
-		description = g_strdup_printf("<span size='larger' weight='bold'>%s</span> - %s\n"
+		if (gtk_tree_model_get_iter(model, &iter, oldpath)) {
+			description = g_strdup_printf("<span size='larger' weight='bold'>%s</span> - %s\n"
 								"<span size='smaller' foreground='dim grey'>%s</span>",
 								old_theme->name, old_theme->author, old_theme->desc);
-		gtk_list_store_set(smiley_theme_store,&iter,1,description,-1);
+			gtk_list_store_set(smiley_theme_store, &iter, 1,
-		g_free(description);
+				description, -1);
-	}
+			g_free(description);
-	gtk_tree_path_free(oldpath);
+		}
+		gtk_tree_path_free(oldpath);
-	gtk_tree_row_reference_free(previous_smiley_row);
+	}
+	if (previous_smiley_row)
+		gtk_tree_row_reference_free(previous_smiley_row);
 	previous_smiley_row = gtk_tree_row_reference_new(model, path);
 	gtk_tree_path_free(path);
 }
-static GtkTreePath *theme_refresh_theme_list()
+static GtkTreeRowReference *theme_refresh_theme_list()
 {
 	GdkPixbuf *pixbuf;
 	GSList *themes;
 	GtkTreeIter iter;
-	GtkTreePath *path = NULL;
+	GtkTreeRowReference *row_ref = NULL;
-	int ind = 0;
+	if (previous_smiley_row)
+		gtk_tree_row_reference_free(previous_smiley_row);
 	previous_smiley_row = NULL;
 	gaim_gtkthemes_smiley_theme_probe();
 	if (!(themes = smiley_themes))
 		return NULL;
 	gtk_list_store_clear(smiley_theme_store);
 	while (themes) {
 		struct smiley_theme *theme = themes->data;
 		if (pixbuf != NULL)
 			g_object_unref(G_OBJECT(pixbuf));
 		g_free(description);
 		themes = themes->next;
-		if (current_smiley_theme && !strcmp(theme->path, current_smiley_theme->path)) {
-			/* path = gtk_tree_path_new_from_indices(ind); */
+		/* If this is the currently selected theme,
-			char *iwishihadgtk2_2 = g_strdup_printf("%d", ind);
+		 * we will need to select it. Grab the row reference. */
-			path = gtk_tree_path_new_from_string(iwishihadgtk2_2);
+		if (theme == current_smiley_theme) {
-			g_free(iwishihadgtk2_2);
+			GtkTreePath *path = gtk_tree_model_get_path(
+				GTK_TREE_MODEL(smiley_theme_store), &iter);
+			row_ref = gtk_tree_row_reference_new(
+				GTK_TREE_MODEL(smiley_theme_store), path);
+			gtk_tree_path_free(path);
 		}
-		ind++;
+	}
-	}
+	return row_ref;
-	return path;
 }
 static void theme_install_theme(char *path, char *extn) {
 #ifndef _WIN32
 	gchar *command, *escaped;
 #endif
 	gchar *destdir;
 	gchar *tail;
-	GtkTreePath *themepath = NULL;
+	GtkTreeRowReference *theme_rowref;
 	/* Just to be safe */
 	g_strchomp(path);
 	/* I dont know what you are, get out of here */
 	g_free(command);
 #endif
 	g_free(destdir);
-	themepath = theme_refresh_theme_list();
+	theme_rowref = theme_refresh_theme_list();
-	if (themepath != NULL)
+	if (theme_rowref != NULL)
-		gtk_tree_path_free(themepath);
+		gtk_tree_row_reference_free(theme_rowref);
 }
 static void
 theme_got_url(void *data, const char *themedata, size_t len)
 {
 	GtkWidget *sw;
 	GtkWidget *view;
 	GtkCellRenderer *rend;
 	GtkTreeViewColumn *col;
 	GtkTreeSelection *sel;
-	GtkTreePath *path = NULL;
+	GtkTreeRowReference *rowref;
 	GtkWidget *label;
 	GtkTargetEntry te[3] = {{"text/plain", 0, 0},{"text/uri-list", 0, 1},{"STRING", 0, 2}};
 	ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
 	gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
 	gtk_box_pack_start(GTK_BOX(ret), sw, TRUE, TRUE, 0);
 	smiley_theme_store = gtk_list_store_new (4, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-	path = theme_refresh_theme_list();
+	rowref = theme_refresh_theme_list();
 	view = gtk_tree_view_new_with_model (GTK_TREE_MODEL(smiley_theme_store));
 	gtk_drag_dest_set(view, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, te,
 					sizeof(te) / sizeof(GtkTargetEntry) , GDK_ACTION_COPY | GDK_ACTION_MOVE);
 	g_signal_connect(G_OBJECT(view), "drag_data_received", G_CALLBACK(theme_dnd_recv), smiley_theme_store);
 	rend = gtk_cell_renderer_pixbuf_new();
 	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
-	if(path) {
-		gtk_tree_selection_select_path(sel, path);
-		gtk_tree_path_free(path);
-	}
 	/* Custom sort so "none" theme is at top of list */
 	gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(smiley_theme_store),
 									3, gaim_sort_smileys, NULL, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW(view), col);
 	g_object_unref(G_OBJECT(smiley_theme_store));
 	gtk_container_add(GTK_CONTAINER(sw), view);
 	g_signal_connect(G_OBJECT(sel), "changed", G_CALLBACK(smiley_sel), NULL);
+	if (rowref) {
+		GtkTreePath *path = gtk_tree_row_reference_get_path(rowref);
+		gtk_tree_row_reference_free(rowref);
+		gtk_tree_selection_select_path(sel, path);
+		gtk_tree_path_free(path);
+	}
 	gtk_widget_show_all(ret);
 	gaim_set_accessible_label (view, label);
 static void
 smiley_theme_pref_cb(const char *name, GaimPrefType type, gpointer value,
 					 gpointer data)
 {
-	if (!strcmp(name, "/gaim/gtk/smileys/theme"))
+	const char *themename = value;
-		gaim_gtkthemes_load_smiley_theme((const char *)value, TRUE);
+	GSList *themes;
+	for (themes = smiley_themes; themes; themes = themes->next) {
+		struct smiley_theme *smile = themes->data;
+		if (smile->name && strcmp(themename, smile->name) == 0) {
+			gaim_gtkthemes_load_smiley_theme(smile->path, TRUE);
+			break;
+		}
+	}
 }
 void
 gaim_gtk_prefs_init(void)
 {
 	gaim_prefs_add_string("/gaim/gtk/filelocations/last_open_folder", "");
 	gaim_prefs_add_string("/gaim/gtk/filelocations/last_icon_folder", "");
 	/* Smiley Themes */
 	gaim_prefs_add_none("/gaim/gtk/smileys");
-	gaim_prefs_add_string("/gaim/gtk/smileys/theme", "default");
+	gaim_prefs_add_string("/gaim/gtk/smileys/theme", "Default");
 	/* Smiley Callbacks */
 	gaim_prefs_connect_callback(prefs, "/gaim/gtk/smileys/theme",
 								smiley_theme_pref_cb, NULL);
 }

Mercurial > pidgin.yaz

comparison src/gtkprefs.c @ 11557:1e7c0773380f