pidgin/pidgin

Some of the macros were code for less than glib 2.48.0 and were supposed to be removed too.

2019-11-15, Gary Kramlich
90a6e8b696b2
Parents 3dac1d752c30
Children fb4b0ae193c0
Some of the macros were code for less than glib 2.48.0 and were supposed to be removed too.
1 files changed, 0 insertions(+), 14 deletions(-)
  • +0 -14
    pidgin/libpidgin.c
    • --- a/pidgin/libpidgin.c Thu Nov 14 23:17:57 2019 -0600
    +++ b/pidgin/libpidgin.c Fri Nov 15 00:16:39 2019 -0600
    @@ -340,21 +340,12 @@
    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 @@
    }
    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")},