summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2019-11-15 00:16:39 -0600
committerGary Kramlich <grim@reaperworld.com>2019-11-15 00:16:39 -0600
commitd8e112ed4450a92d2d0c144e034cab5b60e73cac (patch)
tree7009f1c8ed3b48ca4528ddd2b7fb61072ede2a43
parent648ba023faca548d77e9bc61c26bc7e3100cc25a (diff)
downloadpidgin-d8e112ed4450a92d2d0c144e034cab5b60e73cac.tar.gz
Some of the macros were code for less than glib 2.48.0 and were supposed to be removed too.
-rw-r--r--pidgin/libpidgin.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/pidgin/libpidgin.c b/pidgin/libpidgin.c
index 3080e73e24..e953d97781 100644
--- a/pidgin/libpidgin.c
+++ b/pidgin/libpidgin.c
@@ -340,21 +340,12 @@ static gint
pidgin_handle_local_options_cb(GApplication *app, GVariantDict *options,
gpointer user_data)
{
- gchar *app_id = NULL;
-
if (g_variant_dict_contains(options, "version")) {
printf("%s %s (libpurple %s)\n", PIDGIN_NAME, DISPLAY_VERSION,
purple_core_get_version());
return 0;
}
- if (g_variant_dict_lookup(options, "gapplication-app-id",
- "s", &app_id)) {
- g_variant_dict_remove(options, "gapplication-app-id");
- g_application_set_application_id(app, app_id);
- g_free(app_id);
- }
-
return -1;
}
@@ -411,11 +402,6 @@ login_opt_arg_func(const gchar *option_name, const gchar *value,
}
static GOptionEntry option_entries[] = {
- /* Support G_APPLICATION_CAN_OVERRIDE_APP_ID functionality
- * even though we don't depend on version 2.48 yet
- */
- {"gapplication-app-id", '\0', 0, G_OPTION_ARG_STRING, NULL,
- N_("Override the application's ID") },
{"config", 'c', 0,
G_OPTION_ARG_FILENAME, &opt_config_dir_arg,
N_("use DIR for config files"), N_("DIR")},