diff options
author | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2009-11-06 21:28:04 +0000 |
---|---|---|
committer | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2009-11-06 21:28:04 +0000 |
commit | e08fd14e55cfa7a6da03b11106834fda0f789d4e (patch) | |
tree | 304b863c74654b1d0ae67a58d9ba24a1d4ef3ab0 | |
parent | 09c8a90086dcf8fafedf3a88de577d9be868170c (diff) | |
parent | 9e0a69d6e8ccce0bf30cf5ca9b6c7044306c3c41 (diff) | |
download | pidgin-e08fd14e55cfa7a6da03b11106834fda0f789d4e.tar.gz |
merge of '737062c0d40c8505c5628d28564832d6b0c2fa92'
and 'e9b208719e5410eecd1e6b4ac33246238730b460'
-rw-r--r-- | pidgin/gtkmain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pidgin/gtkmain.c b/pidgin/gtkmain.c index bbbbbcbf5c..4d843de7c0 100644 --- a/pidgin/gtkmain.c +++ b/pidgin/gtkmain.c @@ -541,8 +541,8 @@ int main(int argc, char *argv[]) GIOStatus signal_status; #ifndef DEBUG char *segfault_message_tmp; - GError *error = NULL; #endif + GError *error = NULL; #endif int opt; gboolean gui_check; |