grim/guifications2

merge of '749e0002e61e2e4b797461e8a5cafa9b64f878af'
org.guifications.gf2
2007-04-30, John Bailey
fb3152ae2b39
Parents c7bfeefa48416a8c08895805
Children 40a2a4481cf2
merge of '749e0002e61e2e4b797461e8a5cafa9b64f878af'
and '84cfbe5b2ea9f0639306b8792b8bc81af78bc150'
4 files changed, 11 insertions(+), 7 deletions(-)
  • +4 -4
    src/gf_action.c
  • +5 -1
    src/gf_blist.c
  • +1 -1
    src/gf_preferences.c
  • +1 -1
    src/gf_theme_editor.c
    • --- a/src/gf_action.c Mon Apr 30 02:56:05 2007 -0400
    +++ b/src/gf_action.c Mon Apr 30 02:56:43 2007 -0400
    @@ -545,7 +545,7 @@
    buddy = gf_event_info_get_buddy(info);
    g_return_if_fail(buddy);
    - pidgindialogs_alias_buddy(buddy);
    + pidgin_dialogs_alias_buddy(buddy);
    }
    static void
    @@ -567,7 +567,7 @@
    chat = purple_blist_find_chat(account, conv->name);
    g_return_if_fail(chat);
    - pidgindialogs_alias_chat(chat);
    + pidgin_dialogs_alias_chat(chat);
    }
    static void
    @@ -617,7 +617,7 @@
    buddy = gf_event_info_get_buddy(info);
    g_return_if_fail(buddy);
    - pidgindialogs_remove_buddy(buddy);
    + pidgin_dialogs_remove_buddy(buddy);
    }
    static void
    @@ -639,7 +639,7 @@
    chat = purple_blist_find_chat(account, conv->name);
    g_return_if_fail(chat);
    - pidgindialogs_remove_chat(chat);
    + pidgin_dialogs_remove_chat(chat);
    }
    static void
    --- a/src/gf_blist.c Mon Apr 30 02:56:05 2007 -0400
    +++ b/src/gf_blist.c Mon Apr 30 02:56:43 2007 -0400
    @@ -119,6 +119,7 @@
    GfBlistDialog *dialog = NULL;
    PurpleRequestFields *fields;
    PurpleRequestFieldGroup *group;
    + PurpleAccount *account = NULL;
    GList *l;
    gchar *info;
    const gchar *name = NULL, *format = NULL, *current = NULL;
    @@ -142,6 +143,8 @@
    else
    name = buddy->name;
    + account = purple_buddy_get_account(buddy);
    +
    format = N_("Please select a theme for the buddy %s");
    } else if(PURPLE_BLIST_NODE_IS_CONTACT(node)) {
    PurpleContact *contact = (PurpleContact *)node;
    @@ -206,7 +209,8 @@
    NULL, info, fields,
    _("OK"), G_CALLBACK(gf_blist_dialog_ok_cb),
    _("Cancel"), G_CALLBACK(gf_blist_dialog_cancel_cb),
    - dialog);
    + account, NULL, NULL, dialog);
    +
    g_free(info);
    dialogs = g_list_append(dialogs, dialog);
    --- a/src/gf_preferences.c Mon Apr 30 02:56:05 2007 -0400
    +++ b/src/gf_preferences.c Mon Apr 30 02:56:43 2007 -0400
    @@ -918,7 +918,7 @@
    purple_request_yes_no(guifications, _("Delete theme?"), NULL,
    _("Are you sure you want to delete this theme?"),
    - 0, filename,
    + 0, NULL, NULL, NULL, filename,
    G_CALLBACK(theme_list_delete_yes_cb),
    G_CALLBACK(theme_list_delete_no_cb));
    }
    --- a/src/gf_theme_editor.c Mon Apr 30 02:56:05 2007 -0400
    +++ b/src/gf_theme_editor.c Mon Apr 30 02:56:43 2007 -0400
    @@ -1967,7 +1967,7 @@
    image_dialog = purple_request_file(plugin_handle, _("Open"), "", FALSE,
    G_CALLBACK(gfte_dialog_file_ok_cb),
    G_CALLBACK(gfte_dialog_file_cancel_cb),
    - (gpointer)button);
    + NULL, NULL, NULL, (gpointer)button);
    } else if(type == GFTE_BUTTON_FONT) {
    opt_dialog = gtk_font_selection_dialog_new(_("Select font"));