# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1055420964 0
# Node ID 8f5ccf9e590a57d38bb4e229f056fa49b92153f3
# Parent  5e685e42931e43bf1c394abb64322e7a87b4a0eb
[gaim-migrate @ 6271]
pop goes the namespace change

committer: Tailor Script <tailor@pidgin.im>

diff -r 5e685e42931e -r 8f5ccf9e590a src/gtkaccount.c
--- a/src/gtkaccount.c	Thu Jun 12 05:54:07 2003 +0000
+++ b/src/gtkaccount.c	Thu Jun 12 12:29:24 2003 +0000
@@ -503,7 +503,7 @@
 	gtk_widget_show(label);
 
 	dialog->buddy_icon_entry = gtk_entry_new();
-	gtk_entry_set_editable(GTK_ENTRY(dialog->buddy_icon_entry), FALSE);
+	gtk_editable_set_editable(GTK_EDITABLE(dialog->buddy_icon_entry), FALSE);
 	gtk_box_pack_start(GTK_BOX(hbox), dialog->buddy_icon_entry, TRUE, TRUE, 0);
 	gtk_widget_show(dialog->buddy_icon_entry);
 
diff -r 5e685e42931e -r 8f5ccf9e590a src/main.c
--- a/src/main.c	Thu Jun 12 05:54:07 2003 +0000
+++ b/src/main.c	Thu Jun 12 12:29:24 2003 +0000
@@ -915,7 +915,7 @@
 	}
 
 	/* load plugins we had when we quit */
-	gaim_plugins_load_all();
+	gaim_plugins_load_saved();
 
 	gaim_accounts_load();
 
diff -r 5e685e42931e -r 8f5ccf9e590a src/plugin.c
--- a/src/plugin.c	Thu Jun 12 05:54:07 2003 +0000
+++ b/src/plugin.c	Thu Jun 12 12:29:24 2003 +0000
@@ -547,7 +547,7 @@
 }
 
 void
-gaim_plugins_load_all(void)
+gaim_plugins_load_saved(void)
 {
 #ifdef GAIM_PLUGINS
 	GList *f, *files = gaim_prefs_get_string_list("/plugins/loaded");
diff -r 5e685e42931e -r 8f5ccf9e590a src/plugin.h
--- a/src/plugin.h	Thu Jun 12 05:54:07 2003 +0000
+++ b/src/plugin.h	Thu Jun 12 12:29:24 2003 +0000
@@ -252,7 +252,7 @@
 /**
  * Attempts to load all the plugins that were loaded when gaim last quit
  */
-void gaim_plugins_load_all(void);
+void gaim_plugins_load_saved(void);
 
 /**
  * Probes for plugins in the registered module paths.