im.pidgin.pidgin: 86444fc78caf0bd737a735a030502a10877ed050

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 86444fc78caf0bd737a735a030502a10877ed050
Ancestor: 66747d2effdee1574f75197f1be73f271ef2b3bc
Author: rlaager at pidgin.im
Date: 2008-01-13T16:44:39
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkmain.c

ChangeLog: 

Allow --sync to reach gtk initialization.  This is basically the same as
ticket #3133.  I swear someone submitted a patch to re-work this code so
that this stuff worked in the general case.  gtk_init_check removes any
arguments it understands. [0]

[0] http://developer.gimp.org/api/2.0/gtk/gtk-General.html#gtk-init-check
Refs #3133

-------------- next part --------------
============================================================
--- pidgin/gtkmain.c	d73d7dafe46c731c7dc4d1bec9c8e146f532403d
+++ pidgin/gtkmain.c	e68e49ba37082ccfe6da1a8e78e470c4ef15dac4
@@ -508,6 +508,7 @@ int main(int argc, char *argv[])
 		{"session",  required_argument, NULL, 's'},
 		{"version",  no_argument,       NULL, 'v'},
 		{"display",  required_argument, NULL, 'D'},
+		{"sync",     no_argument,       NULL, 'S'},
 		{0, 0, 0, 0}
 	};
 
@@ -517,7 +518,7 @@ int main(int argc, char *argv[])
 	debug_enabled = FALSE;
 #endif
 
-	/* This is the first Glib function call. Make sure to initialize GThread bfeore then */
+	/* Initialize GThread before calling any Glib or GTK+ functions. */
 	g_thread_init(NULL);
 
 #ifdef ENABLE_NLS
@@ -654,6 +655,7 @@ int main(int argc, char *argv[])
 			opt_si = FALSE;
 			break;
 		case 'D':   /* --display */
+		case 'S':   /* --sync */
 			/* handled by gtk_init_check below */
 			break;
 		case '?':	/* show terse help */