qulogic/libgnt

wms/s: Remove libpurple dependency from sample wms
release-2.x.y
2018-11-30, Mike Ruprecht
4b61a94048af
Parents f5a961a36f65
Children 80dbe1b57ab7
wms/s: Remove libpurple dependency from sample wms

As far as I could tell, wms/s.c is a sample window manager, made
to demonstrate how to use various features of libgnt. Therefore,
it's a little silly to depend on libpurple functionality for it.
This patch removes the dependency of libpurple from the sample wms
by changing it from trying to toggle the buddy list visibility upon
pressing the keyboard shortcut, to simply presenting any window
named "buddylist".
2 files changed, 9 insertions(+), 16 deletions(-)
  • +4 -7
    wms/meson.build
  • +5 -9
    wms/s.c
    • --- a/wms/meson.build Tue Apr 09 01:00:08 2019 -0400
    +++ b/wms/meson.build Fri Nov 30 18:17:33 2018 -0600
    @@ -5,10 +5,7 @@
    name_prefix : '',
    install : true, install_dir : plugindir)
    -if PURPLE_AVAILABLE
    - # These custom wms depend on libpurple
    - s = library('s', 's.c',
    - dependencies : [ncurses, gobject, libgnt_dep, libpurple_dep],
    - name_prefix : '',
    - install : true, install_dir : plugindir)
    -endif
    +s = library('s', 's.c',
    + dependencies : [ncurses, gobject, libgnt_dep],
    + name_prefix : '',
    + install : true, install_dir : plugindir)
    --- a/wms/s.c Tue Apr 09 01:00:08 2019 -0400
    +++ b/wms/s.c Fri Nov 30 18:17:33 2018 -0600
    @@ -1,4 +1,4 @@
    -#include "internal.h"
    +#include "gntinternal.h"
    #include <string.h>
    #include <sys/types.h>
    @@ -11,8 +11,6 @@
    #include "gntwindow.h"
    #include "gntlabel.h"
    -#include "blist.h"
    -
    #define TYPE_S (s_get_gtype())
    #ifdef _S
    @@ -163,14 +161,12 @@
    }
    static gboolean
    -toggle_buddylist(GntBindable *bindable, GList *null)
    +raise_buddylist(GntBindable *bindable, GList *null)
    {
    GntWM *wm = GNT_WM(bindable);
    GntWidget *blist = find_widget(wm, "buddylist");
    if (blist)
    - gnt_widget_destroy(blist);
    - else
    - purple_blist_show();
    + gnt_wm_raise_window(wm, blist);
    return TRUE;
    }
    @@ -186,8 +182,8 @@
    pclass->window_update = s_window_update;
    pclass->mouse_clicked = s_mouse_clicked;
    - gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "toggle-buddylist",
    - toggle_buddylist, "\033" "b", NULL);
    + gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass),
    + "raise-buddylist", raise_buddylist, "\033" "b", NULL);
    gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), GNT_BINDABLE_CLASS(klass));
    GNTDEBUG;
    }