Mercurial > pidgin.yaz
diff pidgin/gtkmain.c @ 26361:38238d41923b
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 |
line wrap: on
line diff
--- a/pidgin/gtkmain.c Sun Mar 15 20:22:28 2009 +0000 +++ b/pidgin/gtkmain.c Mon Mar 16 02:33:48 2009 +0000 @@ -53,6 +53,7 @@ #include "gtkft.h" #include "gtkidle.h" #include "gtklog.h" +#include "gtkmedia.h" #include "gtknotify.h" #include "gtkplugin.h" #include "gtkpounce.h" @@ -311,6 +312,9 @@ pidgin_docklet_init(); pidgin_smileys_init(); pidgin_utils_init(); +#ifdef USE_VV + pidgin_medias_init(); +#endif } static GHashTable *ui_info = NULL; @@ -465,6 +469,7 @@ gboolean opt_help = FALSE; gboolean opt_login = FALSE; gboolean opt_nologin = FALSE; + gboolean opt_nocrash = FALSE; gboolean opt_version = FALSE; gboolean opt_si = TRUE; /* Check for single instance? */ char *opt_config_dir_arg = NULL; @@ -496,6 +501,7 @@ {"login", optional_argument, NULL, 'l'}, {"multiple", no_argument, NULL, 'm'}, {"nologin", no_argument, NULL, 'n'}, + {"nocrash", no_argument, NULL, 'x'}, {"session", required_argument, NULL, 's'}, {"version", no_argument, NULL, 'v'}, {"display", required_argument, NULL, 'D'}, @@ -644,6 +650,9 @@ case 'm': /* do not ensure single instance. */ opt_si = FALSE; break; + case 'x': /* --nocrash */ + opt_nocrash = TRUE; + break; case 'D': /* --display */ case 'S': /* --sync */ /* handled by gtk_init_check below */