Mercurial > pidgin.yaz

comparison pidgin/gtkmain.c @ 26361:38238d41923b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 5573ab30de2e34d78f13bad8ae0b2ac5de6d1083) to branch 'im.pidgin.pidgin.vv' (head 6733a54a9c1b0ab68c8b924c82783cc4af588952)
author Mike Ruprecht <maiku@soc.pidgin.im>
date Mon, 16 Mar 2009 02:33:48 +0000
parents 61fb8b6be8aa 735cb2a137db
children df6fcdebb2fa
comparison
equal deleted inserted replaced
26267:da9e022befd9 26361:38238d41923b
51 #include "gtkdocklet.h" 51 #include "gtkdocklet.h"
52 #include "gtkeventloop.h" 52 #include "gtkeventloop.h"
53 #include "gtkft.h" 53 #include "gtkft.h"
54 #include "gtkidle.h" 54 #include "gtkidle.h"
55 #include "gtklog.h" 55 #include "gtklog.h"
56 #include "gtkmedia.h"
56 #include "gtknotify.h" 57 #include "gtknotify.h"
57 #include "gtkplugin.h" 58 #include "gtkplugin.h"
58 #include "gtkpounce.h" 59 #include "gtkpounce.h"
59 #include "gtkprefs.h" 60 #include "gtkprefs.h"
60 #include "gtkprivacy.h" 61 #include "gtkprivacy.h"
309 pidgin_roomlist_init(); 310 pidgin_roomlist_init();
310 pidgin_log_init(); 311 pidgin_log_init();
311 pidgin_docklet_init(); 312 pidgin_docklet_init();
312 pidgin_smileys_init(); 313 pidgin_smileys_init();
313 pidgin_utils_init(); 314 pidgin_utils_init();
315 #ifdef USE_VV
316 pidgin_medias_init();
317 #endif
314 } 318 }
315 319
316 static GHashTable *ui_info = NULL; 320 static GHashTable *ui_info = NULL;
317 321
318 static void 322 static void
463 { 467 {
464 gboolean opt_force_online = FALSE; 468 gboolean opt_force_online = FALSE;
465 gboolean opt_help = FALSE; 469 gboolean opt_help = FALSE;
466 gboolean opt_login = FALSE; 470 gboolean opt_login = FALSE;
467 gboolean opt_nologin = FALSE; 471 gboolean opt_nologin = FALSE;
472 gboolean opt_nocrash = FALSE;
468 gboolean opt_version = FALSE; 473 gboolean opt_version = FALSE;
469 gboolean opt_si = TRUE; /* Check for single instance? */ 474 gboolean opt_si = TRUE; /* Check for single instance? */
470 char *opt_config_dir_arg = NULL; 475 char *opt_config_dir_arg = NULL;
471 char *opt_login_arg = NULL; 476 char *opt_login_arg = NULL;
472 char *opt_session_arg = NULL; 477 char *opt_session_arg = NULL;
494 {"force-online", no_argument, NULL, 'd'}, 499 {"force-online", no_argument, NULL, 'd'},
495 {"help", no_argument, NULL, 'h'}, 500 {"help", no_argument, NULL, 'h'},
496 {"login", optional_argument, NULL, 'l'}, 501 {"login", optional_argument, NULL, 'l'},
497 {"multiple", no_argument, NULL, 'm'}, 502 {"multiple", no_argument, NULL, 'm'},
498 {"nologin", no_argument, NULL, 'n'}, 503 {"nologin", no_argument, NULL, 'n'},
504 {"nocrash", no_argument, NULL, 'x'},
499 {"session", required_argument, NULL, 's'}, 505 {"session", required_argument, NULL, 's'},
500 {"version", no_argument, NULL, 'v'}, 506 {"version", no_argument, NULL, 'v'},
501 {"display", required_argument, NULL, 'D'}, 507 {"display", required_argument, NULL, 'D'},
502 {"sync", no_argument, NULL, 'S'}, 508 {"sync", no_argument, NULL, 'S'},
503 {0, 0, 0, 0} 509 {0, 0, 0, 0}
642 opt_version = TRUE; 648 opt_version = TRUE;
643 break; 649 break;
644 case 'm': /* do not ensure single instance. */ 650 case 'm': /* do not ensure single instance. */
645 opt_si = FALSE; 651 opt_si = FALSE;
646 break; 652 break;
653 case 'x': /* --nocrash */
654 opt_nocrash = TRUE;
655 break;
647 case 'D': /* --display */ 656 case 'D': /* --display */
648 case 'S': /* --sync */ 657 case 'S': /* --sync */
649 /* handled by gtk_init_check below */ 658 /* handled by gtk_init_check below */
650 break; 659 break;
651 case '?': /* show terse help */ 660 case '?': /* show terse help */