Mercurial > pidgin

changeset 15343:85a2aafc9c4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 18136] some more paths-in-prefs cleanup committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Tue, 16 Jan 2007 05:12:48 +0000
parents 965f7e53e7c5
children 9adb92144e7b
files gtk/gtkaccount.c gtk/gtknotify.c gtk/gtkprefs.c gtk/gtkrequest.c gtk/gtkstatusbox.c gtk/gtkutils.c
diffstat 6 files changed, 26 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/gtkaccount.c	Tue Jan 16 03:13:25 2007 +0000
+++ b/gtk/gtkaccount.c	Tue Jan 16 05:12:48 2007 +0000
@@ -1159,9 +1159,9 @@
 			gaim_account_set_buddy_icon_path(account, dialog->icon_path);
 			gaim_account_set_buddy_icon(account, dialog->cached_icon_path);
 		}
-		else if (gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon") && icon_change)
+		else if (gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon") && icon_change)
 		{
-			const char *filename = gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon");
+			const char *filename = gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon");
 			char *icon = gaim_gtk_convert_buddy_icon(dialog->plugin, filename);
 			gaim_account_set_buddy_icon_path(account, filename);
 			gaim_account_set_buddy_icon(account, icon);
@@ -1987,7 +1987,7 @@
 		gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE);
 
 	if (gaim_account_get_bool(account, "use-global-buddyicon", TRUE))
-		path = gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon");
+		path = gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon");
 	else
 		path = gaim_account_get_ui_string(account, GAIM_GTK_UI, "non-global-buddyicon-path", NULL);
 	if (path != NULL)
@@ -2547,7 +2547,7 @@
 	gaim_prefs_add_none("/gaim/gtk/accounts/dialog");
 	gaim_prefs_add_int("/gaim/gtk/accounts/dialog/width",  520);
 	gaim_prefs_add_int("/gaim/gtk/accounts/dialog/height", 321);
-	gaim_prefs_add_string("/gaim/gtk/accounts/buddyicon", NULL);
+	gaim_prefs_add_path("/gaim/gtk/accounts/buddyicon", NULL);
 
 	gaim_signal_register(gaim_gtk_account_get_handle(), "account-modified",
 						 gaim_marshal_VOID__POINTER, NULL, 1,
--- a/gtk/gtknotify.c	Tue Jan 16 03:13:25 2007 +0000
+++ b/gtk/gtknotify.c	Tue Jan 16 05:12:48 2007 +0000
@@ -1047,7 +1047,7 @@
 	{
 		const char *web_command;
 
-		web_command = gaim_prefs_get_string("/gaim/gtk/browsers/command");
+		web_command = gaim_prefs_get_path("/gaim/gtk/browsers/command");
 
 		if (web_command == NULL || *web_command == '\0')
 		{
--- a/gtk/gtkprefs.c	Tue Jan 16 03:13:25 2007 +0000
+++ b/gtk/gtkprefs.c	Tue Jan 16 05:12:48 2007 +0000
@@ -1198,7 +1198,7 @@
 static gboolean manual_browser_set(GtkWidget *entry, GdkEventFocus *event, gpointer data) {
 	const char *program = gtk_entry_get_text(GTK_ENTRY(entry));
 
-	gaim_prefs_set_string("/gaim/gtk/browsers/command", program);
+	gaim_prefs_set_path("/gaim/gtk/browsers/command", program);
 
 	/* carry on normally */
 	return FALSE;
@@ -1331,7 +1331,7 @@
 	gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
 
 	gtk_entry_set_text(GTK_ENTRY(entry),
-					   gaim_prefs_get_string("/gaim/gtk/browsers/command"));
+					   gaim_prefs_get_path("/gaim/gtk/browsers/command"));
 	g_signal_connect(G_OBJECT(entry), "focus-out-event",
 					 G_CALLBACK(manual_browser_set), NULL);
 	gaim_set_accessible_label (entry, label);
@@ -2035,7 +2035,7 @@
 	/* Browsers */
 	gaim_prefs_add_none("/gaim/gtk/browsers");
 	gaim_prefs_add_int("/gaim/gtk/browsers/place", GAIM_BROWSER_DEFAULT);
-	gaim_prefs_add_string("/gaim/gtk/browsers/command", "");
+	gaim_prefs_add_path("/gaim/gtk/browsers/command", "");
 	gaim_prefs_add_string("/gaim/gtk/browsers/browser", "mozilla");
 #endif
 
@@ -2045,9 +2045,9 @@
 
 	/* File locations */
 	gaim_prefs_add_none("/gaim/gtk/filelocations");
-	gaim_prefs_add_string("/gaim/gtk/filelocations/last_save_folder", "");
-	gaim_prefs_add_string("/gaim/gtk/filelocations/last_open_folder", "");
-	gaim_prefs_add_string("/gaim/gtk/filelocations/last_icon_folder", "");
+	gaim_prefs_add_path("/gaim/gtk/filelocations/last_save_folder", "");
+	gaim_prefs_add_path("/gaim/gtk/filelocations/last_open_folder", "");
+	gaim_prefs_add_path("/gaim/gtk/filelocations/last_icon_folder", "");
 
 	/* Smiley Themes */
 	gaim_prefs_add_none("/gaim/gtk/smileys");
--- a/gtk/gtkrequest.c	Tue Jan 16 03:13:25 2007 +0000
+++ b/gtk/gtkrequest.c	Tue Jan 16 05:12:48 2007 +0000
@@ -1415,9 +1415,9 @@
 	current_folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(data->dialog));
 	if (current_folder != NULL) {
 		if (data->u.file.savedialog) {
-			gaim_prefs_set_string("/gaim/gtk/filelocations/last_save_folder", current_folder);
+			gaim_prefs_set_path("/gaim/gtk/filelocations/last_save_folder", current_folder);
 		} else {
-			gaim_prefs_set_string("/gaim/gtk/filelocations/last_open_folder", current_folder);
+			gaim_prefs_set_path("/gaim/gtk/filelocations/last_open_folder", current_folder);
 		}
 		g_free(current_folder);
 	}
@@ -1455,9 +1455,9 @@
 
 	if (current_folder != NULL) {
 		if (data->u.file.savedialog) {
-			gaim_prefs_set_string("/gaim/gtk/filelocations/last_save_folder", current_folder);
+			gaim_prefs_set_path("/gaim/gtk/filelocations/last_save_folder", current_folder);
 		} else {
-			gaim_prefs_set_string("/gaim/gtk/filelocations/last_open_folder", current_folder);
+			gaim_prefs_set_path("/gaim/gtk/filelocations/last_open_folder", current_folder);
 		}
 		g_free(current_folder);
 	}
@@ -1524,9 +1524,9 @@
 	gtk_dialog_set_default_response(GTK_DIALOG(filesel), GTK_RESPONSE_ACCEPT);
 
 	if (savedialog) {
-		current_folder = gaim_prefs_get_string("/gaim/gtk/filelocations/last_save_folder");
+		current_folder = gaim_prefs_get_path("/gaim/gtk/filelocations/last_save_folder");
 	} else {
-		current_folder = gaim_prefs_get_string("/gaim/gtk/filelocations/last_open_folder");
+		current_folder = gaim_prefs_get_path("/gaim/gtk/filelocations/last_open_folder");
 	}
 
 	if ((filename != NULL) && (*filename != '\0')) {
@@ -1559,9 +1559,9 @@
 			title ? title : (savedialog ? _("Save File...")
 				: _("Open File...")));
 	if (savedialog) {
-		current_folder = gaim_prefs_get_string("/gaim/gtk/filelocations/last_save_folder");
+		current_folder = gaim_prefs_get_path("/gaim/gtk/filelocations/last_save_folder");
 	} else {
-		current_folder = gaim_prefs_get_string("/gaim/gtk/filelocations/last_open_folder");
+		current_folder = gaim_prefs_get_path("/gaim/gtk/filelocations/last_open_folder");
 	}
 	if (current_folder != NULL) {
 		gchar *path = g_strdup_printf("%s%s", current_folder, G_DIR_SEPARATOR_S);
--- a/gtk/gtkstatusbox.c	Tue Jan 16 03:13:25 2007 +0000
+++ b/gtk/gtkstatusbox.c	Tue Jan 16 05:12:48 2007 +0000
@@ -248,7 +248,7 @@
 		menu_item = gaim_new_item_from_stock(box->icon_box_menu, _("Remove"), GTK_STOCK_REMOVE,
 						     G_CALLBACK(remove_buddy_icon_cb),
 						     box, 0, 0, NULL);
-		if (gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon") == NULL)
+		if (gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon") == NULL)
 			gtk_widget_set_sensitive(menu_item, FALSE);
 
 		gtk_menu_popup(GTK_MENU(box->icon_box_menu), NULL, NULL, NULL, NULL,
@@ -339,7 +339,7 @@
 	}
 	else
 	{
-		gtk_gaim_status_box_set_buddy_icon(status_box, gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon"));
+		gtk_gaim_status_box_set_buddy_icon(status_box, gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon"));
 	}
 
 	status_box->hand_cursor = gdk_cursor_new (GDK_HAND2);
@@ -1382,7 +1382,7 @@
 {
 	if (box->account == NULL)
 		/* The pref-connect callback does the actual work */
-		gaim_prefs_set_string("/gaim/gtk/accounts/buddyicon", NULL);
+		gaim_prefs_set_path("/gaim/gtk/accounts/buddyicon", NULL);
 	else
 		buddy_icon_set_cb(NULL, box);
 
@@ -1397,7 +1397,7 @@
 	if (filename) {
 		if (box->account == NULL)
 			/* The pref-connect callback does the actual work */
-			gaim_prefs_set_string("/gaim/gtk/accounts/buddyicon", filename);
+			gaim_prefs_set_path("/gaim/gtk/accounts/buddyicon", filename);
 		else
 			buddy_icon_set_cb(filename, box);
 	}
--- a/gtk/gtkutils.c	Tue Jan 16 03:13:25 2007 +0000
+++ b/gtk/gtkutils.c	Tue Jan 16 05:12:48 2007 +0000
@@ -2261,7 +2261,7 @@
 	filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog->icon_filesel));
 	current_folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog->icon_filesel));
 	if (current_folder != NULL) {
-		gaim_prefs_set_string("/gaim/gtk/filelocations/last_icon_folder", current_folder);
+		gaim_prefs_set_path("/gaim/gtk/filelocations/last_icon_folder", current_folder);
 		g_free(current_folder);
 	}
 
@@ -2284,7 +2284,7 @@
 
 	current_folder = g_path_get_dirname(filename);
 	if (current_folder != NULL) {
-		gaim_prefs_set_string("/gaim/gtk/filelocations/last_icon_folder", current_folder);
+		gaim_prefs_set_path("/gaim/gtk/filelocations/last_icon_folder", current_folder);
 		g_free(current_folder);
 	}
 
@@ -2381,7 +2381,7 @@
 		return NULL;
 	}
 
-	current_folder = gaim_prefs_get_string("/gaim/gtk/filelocations/last_icon_folder");
+	current_folder = gaim_prefs_get_path("/gaim/gtk/filelocations/last_icon_folder");
 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 
 	dialog->icon_filesel = gtk_file_chooser_dialog_new(_("Buddy Icon"),