Merged in default (pull request #493)

Wed, 01 May 2019 01:49:32 +0000

author
Gary Kramlich <grim@reaperworld.com>
date
Wed, 01 May 2019 01:49:32 +0000
changeset 39575
aa447fa8e221
parent 39572
985cb679a998 (current diff)
parent 39574
ce391a974108 (diff)
child 39576
9da340b66f6d

Merged in default (pull request #493)

g_application_set_option_context_summary was adding in glib 2.56, we require 2.44.

Approved-by: Elliott Sales de Andrade
Approved-by: Eion Robb

--- a/pidgin/libpidgin.c	Mon Apr 29 20:15:53 2019 -0500
+++ b/pidgin/libpidgin.c	Wed May 01 01:49:32 2019 +0000
@@ -711,7 +711,6 @@
 int pidgin_start(int argc, char *argv[])
 {
 	GApplication *app;
-	gchar *summary;
 	int ret;
 
 #ifdef DEBUG
@@ -735,10 +734,6 @@
 #endif
 				G_APPLICATION_HANDLES_COMMAND_LINE));
 
-	summary = g_strdup_printf("%s %s", PIDGIN_NAME, DISPLAY_VERSION);
-	g_application_set_option_context_summary(app, summary);
-	g_free(summary);
-
 	g_application_add_main_option_entries(app, option_entries);
 	g_application_add_option_group(app, purple_get_option_group());
 	g_application_add_option_group(app, gplugin_get_option_group());

mercurial