comparison: pidgin/gtkmain.c
pidgin/gtkmain.c
- branch
- vv
- changeset 26337
- ec2fc1bc9024
- parent 25881
- 42756cc75edb
- parent 26274
- bb2639c3caff
- child 26338
- eab4851586b7
equal
deleted
inserted
replaced
| 26044:133e5eca834c | 26337:ec2fc1bc9024 |
|---|---|
| 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 pidgin_medias_init(); | |
| 314 } | 316 } |
| 315 | 317 |
| 316 static GHashTable *ui_info = NULL; | 318 static GHashTable *ui_info = NULL; |
| 317 | 319 |
| 318 static void | 320 static void |
| 463 { | 465 { |
| 464 gboolean opt_force_online = FALSE; | 466 gboolean opt_force_online = FALSE; |
| 465 gboolean opt_help = FALSE; | 467 gboolean opt_help = FALSE; |
| 466 gboolean opt_login = FALSE; | 468 gboolean opt_login = FALSE; |
| 467 gboolean opt_nologin = FALSE; | 469 gboolean opt_nologin = FALSE; |
| 470 gboolean opt_nocrash = FALSE; | |
| 468 gboolean opt_version = FALSE; | 471 gboolean opt_version = FALSE; |
| 469 gboolean opt_si = TRUE; /* Check for single instance? */ | 472 gboolean opt_si = TRUE; /* Check for single instance? */ |
| 470 char *opt_config_dir_arg = NULL; | 473 char *opt_config_dir_arg = NULL; |
| 471 char *opt_login_arg = NULL; | 474 char *opt_login_arg = NULL; |
| 472 char *opt_session_arg = NULL; | 475 char *opt_session_arg = NULL; |
| 642 opt_version = TRUE; | 645 opt_version = TRUE; |
| 643 break; | 646 break; |
| 644 case 'm': /* do not ensure single instance. */ | 647 case 'm': /* do not ensure single instance. */ |
| 645 opt_si = FALSE; | 648 opt_si = FALSE; |
| 646 break; | 649 break; |
| 650 case 'x': /* --nocrash */ | |
| 651 opt_nocrash = TRUE; | |
| 652 break; | |
| 647 case 'D': /* --display */ | 653 case 'D': /* --display */ |
| 648 case 'S': /* --sync */ | 654 case 'S': /* --sync */ |
| 649 /* handled by gtk_init_check below */ | 655 /* handled by gtk_init_check below */ |
| 650 break; | 656 break; |
| 651 case '?': /* show terse help */ | 657 case '?': /* show terse help */ |
