pidgin/purple-plugin-pack

merge of '27ff14e9f32efe56a3ca8766d3b1aad317d5e4c3'
org.guifications.plugins
2008-11-05, grim
92a8368712c3
Parents fb4513242cac315a61452115
Children 05618e8cc564
merge of '27ff14e9f32efe56a3ca8766d3b1aad317d5e4c3'
and 'bf9de8eaa68e20849b5df3aadf71a209f07ec9c4'
2 files changed, 41 insertions(+), 23 deletions(-)
  • +1 -1
    ChangeLog
  • +40 -22
    switchspell/switchspell.c
    • --- a/ChangeLog Wed Nov 05 03:58:53 2008 -0500
    +++ b/ChangeLog Wed Nov 05 04:00:16 2008 -0500
    @@ -1,4 +1,4 @@
    -Version 2.5.0:
    +Version 2.5.0: ??/??/??
    * Fixed some crashes in autprofile related to old preference paths
    (amishmm)
    * ListHandler now handles "FriendlyName" lines in .blt files generated by
    --- a/switchspell/switchspell.c Wed Nov 05 03:58:53 2008 -0500
    +++ b/switchspell/switchspell.c Wed Nov 05 04:00:16 2008 -0500
    @@ -98,20 +98,48 @@
    purple_blist_node_set_string(node, "switchspell", lang);
    }
    +#ifdef USE_ENCHANT
    +struct nufan
    +{
    + GSList *group;
    + GtkWidget *menu;
    + PidginWindow *win;
    +};
    +
    +static void
    +enchant_dict_desc_cb(const char * const lang_tag, const char * const provider_name,
    + const char * const provider_desc, const char * const provider_file,
    + void *user_data)
    +{
    + GtkWidget *menu = ((struct nufan *)user_data)->menu;
    + PidginWindow *win = ((struct nufan *)user_data)->win;
    +
    + GtkWidget *menuitem = gtk_radio_menu_item_new_with_label(group, lang_tag);
    + ((struct nufan *)user_data)->group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));
    + g_object_set_data(G_OBJECT(menuitem), "user_data", win);
    + g_object_set_data_full(G_OBJECT(menuitem), "lang", g_strdup(lang_tag), g_free);
    + g_signal_connect(G_OBJECT(menuitem), "activate",
    + G_CALLBACK(menu_conv_use_dict_cb), NULL);
    + gtk_widget_show(menuitem);
    + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
    +}
    +#endif
    +
    static void
    regenerate_switchspell_menu(PidginConversation *gtkconv)
    {
    PidginWindow *win;
    GtkWidget *menu;
    GtkWidget *mitem;
    - GSList *group = NULL;
    #ifdef USE_ENCHANT
    - EnchantBroker * eb;
    + struct nufan user_data;
    + EnchantBroker *eb;
    #else
    - AspellConfig * config;
    - AspellDictInfoList * dlist;
    - AspellDictInfoEnumeration * dels;
    - const AspellDictInfo * entry;
    + GSList *group = NULL;
    + AspellConfig *config;
    + AspellDictInfoList *dlist;
    + AspellDictInfoEnumeration *dels;
    + const AspellDictInfo *entry;
    #endif
    if (gtkconv == NULL)
    @@ -135,11 +163,12 @@
    gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), menu);
    #ifdef USE_ENCHANT
    - void enchant_dict_desc_cb(const char * const lang_tag, const char * const provider_name,
    - const char * const provider_desc, const char * const provider_file,
    - void *user_data)
    - {
    - GtkWidget *menuitem = gtk_radio_menu_item_new_with_label(group, lang_tag);
    + user_data.group = NULL;
    + user_data.menu = menu;
    + user_data.win = win;
    + eb = enchant_broker_init();
    + enchant_broker_list_dicts(eb, enchant_dict_desc_cb, &user_data);
    + enchant_broker_free(eb);
    #else
    config = new_aspell_config();
    dlist = get_aspell_dict_info_list(config);
    @@ -149,25 +178,14 @@
    aspell_dict_info_list_empty(dlist);
    while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) {
    GtkWidget *menuitem = gtk_radio_menu_item_new_with_label(group, entry->name);
    -#endif
    group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));
    g_object_set_data(G_OBJECT(menuitem), "user_data", win);
    -#ifdef USE_ENCHANT
    - g_object_set_data_full(G_OBJECT(menuitem), "lang", g_strdup(lang_tag), g_free);
    -#else
    g_object_set_data_full(G_OBJECT(menuitem), "lang", g_strdup((gchar *)entry->name), g_free);
    -#endif
    g_signal_connect(G_OBJECT(menuitem), "activate",
    G_CALLBACK(menu_conv_use_dict_cb), NULL);
    gtk_widget_show(menuitem);
    gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
    }
    -
    -#ifdef USE_ENCHANT
    - eb = enchant_broker_init();
    - enchant_broker_list_dicts(eb, enchant_dict_desc_cb, NULL);
    - enchant_broker_free(eb);
    -#else
    delete_aspell_dict_info_enumeration(dels);
    #endif
    gtk_widget_show_all(menu);