Mercurial > pidgin.yaz
comparison pidgin/gtkmain.c @ 26353:07e22e1897f6
merge of '2fbd079d0e8c53d5a6f240df5232b63c780212c0'
and 'c9fd123647e096ece866dda08832d16860aecd73'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 22 Mar 2009 23:44:31 +0000 |
| parents | 61fb8b6be8aa |
| children | 00eb738116ae f5e613e05332 38238d41923b |
comparison
equal
deleted
inserted
replaced
| 26000:31bb0d6e7f7e | 26353:07e22e1897f6 |
|---|---|
| 667 #endif | 667 #endif |
| 668 return 0; | 668 return 0; |
| 669 } | 669 } |
| 670 /* show version message */ | 670 /* show version message */ |
| 671 if (opt_version) { | 671 if (opt_version) { |
| 672 printf("%s %s\n", PIDGIN_NAME, DISPLAY_VERSION); | 672 printf("%s %s (libpurple %s)\n", PIDGIN_NAME, DISPLAY_VERSION, |
| 673 purple_core_get_version()); | |
| 673 #ifdef HAVE_SIGNAL_H | 674 #ifdef HAVE_SIGNAL_H |
| 674 g_free(segfault_message); | 675 g_free(segfault_message); |
| 675 #endif | 676 #endif |
| 676 return 0; | 677 return 0; |
| 677 } | 678 } |