comparison pidgin-twitter.c @ 101:ceabb8099bf3

merged

100:86772af940ce

    if(!icon_id) {
        return;
    }

    /* insert icon actually */
    gtk_imhtml_insert_image_at_iter(target_imhtml, icon_id, &insertion_point);
    gtk_text_buffer_delete_mark(target_buffer, requested_mark);
    requested_mark = NULL;
}

static void

        g_free(user_name); user_name = NULL;
        return;
    }

    /* if we have icon for this user, insert icon immediately */
    gtk_imhtml_insert_image_at_iter(imhtml, icon_id, &insertion_point);
    g_free(user_name); user_name = NULL;

    twitter_debug("reach end of function\n");
}

    purple_prefs_connect_callback(plugin, OPT_COUNTER, counter_prefs_cb, NULL);

    /* suppress oops message */
    pref = purple_plugin_pref_new_with_name_and_label(OPT_SUPPRESS_OOPS,
                                                      "Suppress oops message");
    purple_plugin_pref_frame_add(frame, pref);


    /*****************/
    /* sound heading */

    purple_prefs_add_int(OPT_SOUNDID_SENDER, PURPLE_SOUND_POUNCE_DEFAULT);
    purple_prefs_add_string(OPT_USERLIST_SENDER, DEFAULT_LIST);

    purple_prefs_add_bool(OPT_COUNTER, TRUE);
    purple_prefs_add_bool(OPT_SUPPRESS_OOPS, TRUE);

    purple_prefs_add_bool(OPT_PREVENT_NOTIFICATION, FALSE);

    purple_prefs_add_bool(OPT_API_BASE_POST, FALSE);
    purple_prefs_add_string(OPT_SCREEN_NAME, EMPTY);
    purple_prefs_add_string(OPT_PASSWORD, EMPTY);
}

101:ceabb8099bf3

    if(!icon_id) {
        return;
    }

    /* insert icon actually */
    if(purple_prefs_get_bool(OPT_SHOW_ICON))
        gtk_imhtml_insert_image_at_iter(target_imhtml,
                                        icon_id, &insertion_point);
    gtk_text_buffer_delete_mark(target_buffer, requested_mark);
    requested_mark = NULL;
}

static void

        g_free(user_name); user_name = NULL;
        return;
    }

    /* if we have icon for this user, insert icon immediately */
    if(purple_prefs_get_bool(OPT_SHOW_ICON))
        gtk_imhtml_insert_image_at_iter(imhtml, icon_id, &insertion_point);
    g_free(user_name); user_name = NULL;

    twitter_debug("reach end of function\n");
}

    purple_prefs_connect_callback(plugin, OPT_COUNTER, counter_prefs_cb, NULL);

    /* suppress oops message */
    pref = purple_plugin_pref_new_with_name_and_label(OPT_SUPPRESS_OOPS,
                                                      "Suppress oops message");
    purple_plugin_pref_frame_add(frame, pref);

    /* show icon */
    pref = purple_plugin_pref_new_with_name_and_label(OPT_SHOW_ICON,
                                                      "Show icon");
    purple_plugin_pref_frame_add(frame, pref);


    /*****************/
    /* sound heading */

    purple_prefs_add_int(OPT_SOUNDID_SENDER, PURPLE_SOUND_POUNCE_DEFAULT);
    purple_prefs_add_string(OPT_USERLIST_SENDER, DEFAULT_LIST);

    purple_prefs_add_bool(OPT_COUNTER, TRUE);
    purple_prefs_add_bool(OPT_SUPPRESS_OOPS, TRUE);
    purple_prefs_add_bool(OPT_PREVENT_NOTIFICATION, FALSE);
    purple_prefs_add_bool(OPT_SHOW_ICON, TRUE);



    purple_prefs_add_bool(OPT_API_BASE_POST, FALSE);
    purple_prefs_add_string(OPT_SCREEN_NAME, EMPTY);
    purple_prefs_add_string(OPT_PASSWORD, EMPTY);
}