--- a/finch/libfinch.c Thu Oct 05 21:51:59 2017 -0500
+++ b/finch/libfinch.c Thu Oct 05 22:23:56 2017 -0500
@@ -29,6 +29,7 @@
@@ -146,9 +147,6 @@
G_OPTION_ARG_FILENAME, &opt_config_dir_arg,
_("use DIR for config files"), _("DIR")},
- G_OPTION_ARG_NONE, &debug_enabled,
- _("print debugging messages to stderr"), NULL},
G_OPTION_ARG_NONE, &opt_nologin,
_("don't automatically login"), NULL},
@@ -170,6 +168,7 @@
g_option_context_set_summary(context, DISPLAY_VERSION);
g_option_context_add_main_entries(context, option_entries, PACKAGE);
+ g_option_context_add_group(context, purple_get_option_group()); g_option_context_add_group(context, gplugin_get_option_group());
--- a/libpurple/meson.build Thu Oct 05 21:51:59 2017 -0500
+++ b/libpurple/meson.build Thu Oct 05 22:23:56 2017 -0500
@@ -39,6 +39,7 @@
@@ -118,6 +119,7 @@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/options.c Thu Oct 05 22:23:56 2017 -0500
@@ -0,0 +1,68 @@
+ * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA +/****************************************************************************** + *****************************************************************************/ +debug_opt_arg_func(const gchar *option_name, const gchar *value, + gpointer data, GError **error) + purple_debug_set_enabled(TRUE); + if (purple_strequal(value, "colored")) { + purple_debug_set_colored(TRUE); +/****************************************************************************** + *****************************************************************************/ +purple_get_option_group(void) { + GOptionGroup *group = NULL; + GOptionEntry entries[] = { + "debug", 'd', G_OPTION_FLAG_OPTIONAL_ARG, + G_OPTION_ARG_CALLBACK, &debug_opt_arg_func, + _("print debugging messages to stdout"), + group = g_option_group_new( + _("LibPurple options"), + _("Show LibPurple Options"), + g_option_group_add_entries(group, entries); --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/options.h Thu Oct 05 22:23:56 2017 -0500
@@ -0,0 +1,33 @@
+ * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA +#ifndef PURPLE_OPTIONS_H +#define PURPLE_OPTIONS_H +GOptionGroup *purple_get_option_group(void); +#endif /* PURPLE_OPTIONS_H */ --- a/pidgin/libpidgin.c Thu Oct 05 21:51:59 2017 -0500
+++ b/pidgin/libpidgin.c Thu Oct 05 22:23:56 2017 -0500
@@ -33,6 +33,7 @@
@@ -375,25 +376,10 @@
purple_blist_set_visible(TRUE);
-static gboolean debug_colored = FALSE;
-static gboolean debug_enabled = FALSE;
static gboolean opt_login = FALSE;
static gchar *opt_login_arg = NULL;
-debug_opt_arg_func(const gchar *option_name, const gchar *value,
- gpointer data, GError **error)
- if (purple_strequal(value, "colored")) {
login_opt_arg_func(const gchar *option_name, const gchar *value,
gpointer data, GError **error)
@@ -441,10 +427,6 @@
G_OPTION_ARG_FILENAME, &opt_config_dir_arg,
_("use DIR for config files"), _("DIR")},
- {"debug", 'd', G_OPTION_FLAG_OPTIONAL_ARG,
- G_OPTION_ARG_CALLBACK, &debug_opt_arg_func,
- _("print debugging messages to stdout"),
G_OPTION_ARG_NONE, &opt_force_online,
_("force online, regardless of network status"), NULL},
@@ -468,11 +450,8 @@
+ purple_debug_set_enabled(TRUE); @@ -594,8 +573,9 @@
g_option_context_add_main_entries(context, option_entries, PACKAGE);
+ g_option_context_add_group(context, purple_get_option_group()); + g_option_context_add_group(context, gplugin_get_option_group()); g_option_context_add_group(context, gtk_get_option_group(TRUE));
- g_option_context_add_group(context, gplugin_get_option_group());
/* Handle Unicode filenames on Windows. See GOptionContext docs. */
@@ -647,11 +627,6 @@
- if (g_getenv("PIDGIN_DEBUG_COLORED") != NULL)
- purple_debug_set_enabled(debug_enabled);
- purple_debug_set_colored(debug_colored);
app = G_APPLICATION(gtk_application_new("im.pidgin.Pidgin",
G_APPLICATION_NON_UNIQUE));