pidgin/pidgin

Account Options: hinted string options; fix perl plugins compilation

2012-08-14, Tomasz Wasilczyk
c3ee96290bfd
Parents 2188505ba110
Children a24713d9bbb38966c9ad5be9
Account Options: hinted string options; fix perl plugins compilation
5 files changed, 87 insertions(+), 17 deletions(-)
  • +34 -8
    libpurple/accountopt.c
  • +23 -2
    libpurple/accountopt.h
  • +2 -2
    libpurple/plugins/perl/common/AccountOpts.xs
  • +27 -4
    pidgin/gtkaccount.c
  • +1 -1
    pidgin/plugins/perl/common/Makefile.PL.in
    • --- a/libpurple/accountopt.c Tue Aug 14 04:02:22 2012 -0400
    +++ b/libpurple/accountopt.c Tue Aug 14 22:05:05 2012 +0200
    @@ -50,10 +50,17 @@
    } default_value;
    - gboolean masked; /**< Whether the value entered should be
    - * obscured from view (for passwords and
    - * similar options)
    - */
    + union
    + {
    + struct
    + {
    + gboolean masked; /**< Whether the value entered should
    + * be obscured from view (for
    + * passwords and similar options)
    + */
    + GSList *hints; /**< List of hinted values */
    + } string;
    + } params;
    };
    /**
    @@ -177,6 +184,7 @@
    if (option->type == PURPLE_PREF_STRING)
    {
    g_free(option->default_value.string);
    + g_slist_free_full(option->params.string.hints, &g_free);
    }
    else if (option->type == PURPLE_PREF_STRING_LIST)
    {
    @@ -221,14 +229,23 @@
    }
    void
    -purple_account_option_set_masked(PurpleAccountOption *option, gboolean masked)
    +purple_account_option_string_set_masked(PurpleAccountOption *option, gboolean masked)
    {
    g_return_if_fail(option != NULL);
    g_return_if_fail(option->type == PURPLE_PREF_STRING);
    - option->masked = masked;
    + option->params.string.masked = masked;
    }
    +void
    +purple_account_option_string_set_hints(PurpleAccountOption *option, GSList *hints)
    +{
    + g_return_if_fail(option != NULL);
    + g_return_if_fail(option->type == PURPLE_PREF_STRING);
    +
    + g_slist_free_full(option->params.string.hints, &g_free);
    + option->params.string.hints = hints;
    +}
    void
    purple_account_option_set_list(PurpleAccountOption *option, GList *values)
    @@ -332,12 +349,21 @@
    }
    gboolean
    -purple_account_option_get_masked(const PurpleAccountOption *option)
    +purple_account_option_string_get_masked(const PurpleAccountOption *option)
    {
    g_return_val_if_fail(option != NULL, FALSE);
    g_return_val_if_fail(option->type == PURPLE_PREF_STRING, FALSE);
    - return option->masked;
    + return option->params.string.masked;
    +}
    +
    +const GSList *
    +purple_account_option_string_get_hints(const PurpleAccountOption *option)
    +{
    + g_return_val_if_fail(option != NULL, FALSE);
    + g_return_val_if_fail(option->type == PURPLE_PREF_STRING, FALSE);
    +
    + return option->params.string.hints;
    }
    GList *
    --- a/libpurple/accountopt.h Tue Aug 14 04:02:22 2012 -0400
    +++ b/libpurple/accountopt.h Tue Aug 14 22:05:05 2012 +0200
    @@ -158,7 +158,19 @@
    * @param masked The masking.
    */
    void
    -purple_account_option_set_masked(PurpleAccountOption *option, gboolean masked);
    +purple_account_option_string_set_masked(PurpleAccountOption *option, gboolean masked);
    +
    +/**
    + * Sets the hint list for an account option.
    + *
    + * The list passed will be owned by the account option, and the
    + * strings inside will be freed automatically.
    + *
    + * @param option The account option.
    + * @param hints The list of hints, stored as strings.
    + */
    +void purple_account_option_string_set_hints(PurpleAccountOption *option,
    + GSList *hints);
    /**
    * Sets the list values for an account option.
    @@ -261,7 +273,16 @@
    * @return %TRUE if the option's value should be obscured.
    */
    gboolean
    -purple_account_option_get_masked(const PurpleAccountOption *option);
    +purple_account_option_string_get_masked(const PurpleAccountOption *option);
    +
    +/**
    + * Returns the list of hints for an account option.
    + *
    + * @param option The account option.
    + *
    + * @constreturn A list of hints, stored as strings.
    + */
    +const GSList * purple_account_option_string_get_hints(const PurpleAccountOption *option);
    /**
    * Returns the list values for an account option.
    --- a/libpurple/plugins/perl/common/AccountOpts.xs Tue Aug 14 04:02:22 2012 -0400
    +++ b/libpurple/plugins/perl/common/AccountOpts.xs Tue Aug 14 22:05:05 2012 +0200
    @@ -102,7 +102,7 @@
    Purple::Account::Option option
    gboolean
    -purple_account_option_get_masked(option)
    +purple_account_option_string_get_masked(option)
    Purple::Account::Option option
    int
    @@ -138,7 +138,7 @@
    purple_account_option_set_list(option, t_GL);
    void
    -purple_account_option_set_masked(option, masked)
    +purple_account_option_string_set_masked(option, masked)
    Purple::Account::Option option
    gboolean masked
    --- a/pidgin/gtkaccount.c Tue Aug 14 04:02:22 2012 -0400
    +++ b/pidgin/gtkaccount.c Tue Aug 14 22:05:05 2012 +0200
    @@ -812,6 +812,7 @@
    const char *str_value;
    gboolean bool_value;
    ProtocolOptEntry *opt_entry;
    + const GSList *str_hints;
    if (dialog->protocol_frame != NULL) {
    gtk_notebook_remove_page (GTK_NOTEBOOK(dialog->notebook), 1);
    @@ -912,8 +913,25 @@
    purple_account_option_get_default_string(option));
    }
    - opt_entry->widget = entry = gtk_entry_new();
    - if (purple_account_option_get_masked(option))
    + str_hints = purple_account_option_string_get_hints(option);
    + if (str_hints)
    + {
    + const GSList *hint_it = str_hints;
    + entry = gtk_combo_box_entry_new_text();
    + while (hint_it)
    + {
    + const gchar *hint = hint_it->data;
    + hint_it = g_list_next(hint_it);
    + gtk_combo_box_append_text(GTK_COMBO_BOX(entry), hint);
    + }
    + }
    + else
    + entry = gtk_entry_new();
    +
    + opt_entry->widget = entry;
    + if (purple_account_option_string_get_masked(option) && str_hints)
    + g_warn_if_reached();
    + else if (purple_account_option_string_get_masked(option))
    {
    gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
    #if !GTK_CHECK_VERSION(2,16,0)
    @@ -922,7 +940,9 @@
    #endif /* Less than GTK+ 2.16 */
    }
    - if (str_value != NULL)
    + if (str_value != NULL && str_hints)
    + gtk_entry_set_text(GTK_ENTRY(GTK_BIN(entry)->child), str_value);
    + else
    gtk_entry_set_text(GTK_ENTRY(entry), str_value);
    title = g_strdup_printf("_%s:",
    @@ -1453,7 +1473,10 @@
    switch (opt_entry->type) {
    case PURPLE_PREF_STRING:
    - value = gtk_entry_get_text(GTK_ENTRY(opt_entry->widget));
    + if (GTK_IS_COMBO_BOX(opt_entry->widget))
    + value = gtk_combo_box_get_active_text(GTK_COMBO_BOX(opt_entry->widget));
    + else
    + value = gtk_entry_get_text(GTK_ENTRY(opt_entry->widget));
    purple_account_set_string(account, opt_entry->setting, value);
    break;
    --- a/pidgin/plugins/perl/common/Makefile.PL.in Tue Aug 14 04:02:22 2012 -0400
    +++ b/pidgin/plugins/perl/common/Makefile.PL.in Tue Aug 14 22:05:05 2012 +0200
    @@ -10,7 +10,7 @@
    'AUTHOR' => 'Pidgin <http://pidgin.im/>') : ()),
    'DEFINE' => '@DEBUG_CFLAGS@',
    'dynamic_lib' => { 'OTHERLDFLAGS' => '@LDFLAGS@' },
    - 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple -I@top_srcdir@/pidgin @GTK_CFLAGS@',
    + 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple -I@top_srcdir@/pidgin @GTK_CFLAGS@ @WEBKIT_CFLAGS@',
    'OBJECT' => '$(O_FILES)', # link all the C files too
    'TYPEMAPS' => ["@top_srcdir@/libpurple/plugins/perl/common/typemap"],
    # 'OPTIMIZE' => '-g', # For debugging.