Mercurial > pidgin.yaz
diff pidgin/gtkmain.c @ 20407:1122d47583a1
explicit merge of 'd42ad2da81f881b2fbd2fb080cc70a843bc70d02'
and '8582c561c020d2d1e8d358e2e7cd9e3da113ed9e'
to branch 'im.pidgin.cpw.khc.msnp14'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Wed, 02 May 2007 05:25:27 +0000 |
| parents | 0973688f4b74 |
| children | 0fc1b85fd247 4999bbc52881 be098f796b32 |
line wrap: on
line diff
--- a/pidgin/gtkmain.c Sun Apr 15 20:12:06 2007 +0000 +++ b/pidgin/gtkmain.c Wed May 02 05:25:27 2007 +0000 @@ -249,7 +249,7 @@ #endif - pidginthemes_init(); + pidgin_themes_init(); pidgin_blist_setup_sort_methods(); @@ -602,6 +602,9 @@ case '?': /* show terse help */ default: show_usage(argv[0], TRUE); +#ifdef HAVE_SIGNAL_H + g_free(segfault_message); +#endif return 0; break; } @@ -610,11 +613,17 @@ /* show help message */ if (opt_help) { show_usage(argv[0], FALSE); +#ifdef HAVE_SIGNAL_H + g_free(segfault_message); +#endif return 0; } /* show version message */ if (opt_version) { printf(PIDGIN_NAME " %s\n", VERSION); +#ifdef HAVE_SIGNAL_H + g_free(segfault_message); +#endif return 0; } @@ -643,6 +652,9 @@ g_warning("cannot open display: %s", display ? display : "unset"); g_free(display); +#ifdef HAVE_SIGNAL_H + g_free(segfault_message); +#endif return 1; } @@ -667,6 +679,9 @@ fprintf(stderr, "Initialization of the " PIDGIN_NAME " core failed. Dumping core.\n" "Please report this!\n"); +#ifdef HAVE_SIGNAL_H + g_free(segfault_message); +#endif abort(); }