qulogic/pidgin

Move the force online option into the libpurple option group

2017-10-05, Gary Kramlich
60c745a9e06d
Parents afb1c8302e49
Children ec6c429d5f7b
Move the force online option into the libpurple option group
2 files changed, 18 insertions(+), 11 deletions(-)
  • +18 -2
    libpurple/options.c
  • +0 -9
    pidgin/libpidgin.c
    • --- a/libpurple/options.c Thu Oct 05 22:23:56 2017 -0500
    +++ b/libpurple/options.c Thu Oct 05 22:40:30 2017 -0500
    @@ -23,11 +23,13 @@
    #include "options.h"
    +#include "network.h"
    +
    /******************************************************************************
    * Callbacks
    *****************************************************************************/
    static gboolean
    -debug_opt_arg_func(const gchar *option_name, const gchar *value,
    +debug_cb(const gchar *option_name, const gchar *value,
    gpointer data, GError **error)
    {
    purple_debug_set_enabled(TRUE);
    @@ -39,6 +41,15 @@
    return TRUE;
    }
    +static gboolean
    +force_online_cb(const gchar *option_name, const gchar *value,
    + gpointer data, GError **error)
    +{
    + purple_network_force_online();
    +
    + return TRUE;
    +}
    +
    /******************************************************************************
    * API
    *****************************************************************************/
    @@ -48,9 +59,14 @@
    GOptionEntry entries[] = {
    {
    "debug", 'd', G_OPTION_FLAG_OPTIONAL_ARG,
    - G_OPTION_ARG_CALLBACK, &debug_opt_arg_func,
    + G_OPTION_ARG_CALLBACK, &debug_cb,
    _("print debugging messages to stdout"),
    _("[colored]")
    + }, {
    + "force-online", 'f', 0,
    + G_OPTION_ARG_NONE, &force_online_cb,
    + _("force online, regardless of network status"),
    + NULL
    },
    };
    --- a/pidgin/libpidgin.c Thu Oct 05 22:23:56 2017 -0500
    +++ b/pidgin/libpidgin.c Thu Oct 05 22:40:30 2017 -0500
    @@ -394,7 +394,6 @@
    int pidgin_start(int argc, char *argv[])
    {
    GApplication *app;
    - gboolean opt_force_online = FALSE;
    gboolean opt_nologin = FALSE;
    gboolean opt_version = FALSE;
    gboolean opt_si = TRUE; /* Check for single instance? */
    @@ -427,9 +426,6 @@
    {"config", 'c', 0,
    G_OPTION_ARG_FILENAME, &opt_config_dir_arg,
    _("use DIR for config files"), _("DIR")},
    - {"force-online", 'f', 0,
    - G_OPTION_ARG_NONE, &opt_force_online,
    - _("force online, regardless of network status"), NULL},
    {"login", 'l', G_OPTION_FLAG_OPTIONAL_ARG,
    G_OPTION_ARG_CALLBACK, &login_opt_arg_func,
    _("enable specified account(s) (optional argument NAME\n"
    @@ -717,11 +713,6 @@
    g_free(opt_config_dir_arg);
    opt_config_dir_arg = NULL;
    - /* This needs to be before purple_blist_show() so the
    - * statusbox gets the forced online status. */
    - if (opt_force_online)
    - purple_network_force_online();
    -
    /*
    * We want to show the blist early in the init process so the
    * user feels warm and fuzzy (not cold and prickley).