qulogic/pidgin

Merged in CMaiku/pidgin (pull request #367)

2018-06-09, Gary Kramlich
adf7ec9cd09c
Parents cfab2119b1b714bf4612a588
Children 6b6eb8ca2c2c
Merged in CMaiku/pidgin (pull request #367)

gtkdebug: Fix initial filter level of debug window

Approved-by: Elliott Sales de Andrade
Approved-by: Eion Robb
Approved-by: Gary Kramlich
1 files changed, 14 insertions(+), 3 deletions(-)
  • +14 -3
    pidgin/gtkdebug.c
    • --- a/pidgin/gtkdebug.c Sat Jun 09 01:42:45 2018 +0000
    +++ b/pidgin/gtkdebug.c Sat Jun 09 01:43:48 2018 +0000
    @@ -354,10 +354,8 @@
    }
    static void
    -filter_level_pref_changed(const char *name, PurplePrefType type, gconstpointer value, gpointer data)
    +debug_window_set_filter_level(DebugWindow *win, int level)
    {
    - DebugWindow *win = data;
    - int level = GPOINTER_TO_INT(value);
    char *tmp;
    if (level != gtk_combo_box_get_active(GTK_COMBO_BOX(win->filterlevel)))
    @@ -369,6 +367,15 @@
    }
    static void
    +filter_level_pref_changed(const char *name, PurplePrefType type, gconstpointer value, gpointer data)
    +{
    + DebugWindow *win = data;
    + int level = GPOINTER_TO_INT(value);
    +
    + debug_window_set_filter_level(win, level);
    +}
    +
    +static void
    filter_level_changed_cb(GtkWidget *combo, gpointer null)
    {
    purple_prefs_set_int(PIDGIN_PREFS_ROOT "/debug/filterlevel",
    @@ -633,6 +640,10 @@
    gtkdebug_html = g_bytes_get_data(resource_bytes, NULL);
    pidgin_webview_load_html_string(PIDGIN_WEBVIEW(win->text),
    gtkdebug_html);
    +
    + /* Set active filter level in webview */
    + debug_window_set_filter_level(win, purple_prefs_get_int(
    + PIDGIN_PREFS_ROOT "/debug/filterlevel"));
    }
    g_bytes_unref(resource_bytes);
    gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);