Mercurial > pidgin
changeset 22473:8aa07f5d1524
merge of '5d1e097eb7e127d7b1bc269ee71992478f79a182'
and 'd455bbecfc1b674264ec56b2b4af22db845058ed'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Thu, 13 Mar 2008 01:44:01 +0000 |
| parents | 723c7f610d2d (diff) 713310b97512 (current diff) |
| children | 53ffaf968813 |
| files | |
| diffstat | 3 files changed, 14 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/joinpart.c Thu Mar 13 01:43:46 2008 +0000 +++ b/libpurple/plugins/joinpart.c Thu Mar 13 01:44:01 2008 +0000 @@ -77,7 +77,7 @@ { PurpleConvChat *chat; int threshold; - struct joinpart_key *key; + struct joinpart_key key; time_t *last_said; g_return_val_if_fail(conv != NULL, FALSE); @@ -94,10 +94,9 @@ return FALSE; /* Only show the notice if the user has spoken recently. */ - key = g_new(struct joinpart_key, 1); - key->conv = conv; - key->user = g_strdup(name); - last_said = g_hash_table_lookup(users, key); + key.conv = conv; + key.user = (gchar *)name; + last_said = g_hash_table_lookup(users, &key); if (last_said != NULL) { int delay = purple_prefs_get_int(DELAY_PREF);
--- a/libpurple/protocols/oscar/oscar.c Thu Mar 13 01:43:46 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Thu Mar 13 01:44:01 2008 +0000 @@ -6521,7 +6521,7 @@ if (od->icq) { - act = purple_plugin_action_new(_("Set User Info (URL)..."), + act = purple_plugin_action_new(_("Set User Info (web)..."), oscar_show_set_info_icqurl); menu = g_list_prepend(menu, act); } @@ -6532,11 +6532,11 @@ if (od->authinfo->chpassurl != NULL) { - act = purple_plugin_action_new(_("Change Password (URL)"), + act = purple_plugin_action_new(_("Change Password (web)"), oscar_show_chpassurl); menu = g_list_prepend(menu, act); - act = purple_plugin_action_new(_("Configure IM Forwarding (URL)"), + act = purple_plugin_action_new(_("Configure IM Forwarding (web)"), oscar_show_imforwardingurl); menu = g_list_prepend(menu, act); }
--- a/pidgin/gtkplugin.c Thu Mar 13 01:43:46 2008 +0000 +++ b/pidgin/gtkplugin.c Thu Mar 13 01:44:01 2008 +0000 @@ -81,9 +81,7 @@ config = pidgin_plugin_pref_create_frame(frame); - /* XXX According to bug #1407047 this broke saving pluging preferences, I'll look at fixing it correctly later. - purple_plugin_pref_frame_destroy(frame); - */ + plugin->info->prefs_info->frame = frame; } return config; @@ -212,6 +210,12 @@ plugin_pref_dialogs = NULL; } gtk_widget_destroy(d); + + if (plug->info->prefs_info && plug->info->prefs_info->frame) { + purple_plugin_pref_frame_destroy(plug->info->prefs_info->frame); + plug->info->prefs_info->frame = NULL; + } + break; } }