Mercurial > pidgin
changeset 16142:74b2d576f458
merge of '52a3faed357c462274cac6f2f6359606dd4cdb3d'
and 'b5dac556bdc86554ba63bb94268d35f51d2b320f'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 15 Apr 2007 18:06:49 +0000 |
| parents | 9699941af4c4 (diff) 309c1478b457 (current diff) |
| children | 598b1b15b199 |
| files | pidgin/plugins/gaiminc.c |
| diffstat | 4 files changed, 21 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntconv.h Sun Apr 15 16:05:47 2007 +0000 +++ b/finch/gntconv.h Sun Apr 15 18:06:49 2007 +0000 @@ -47,6 +47,7 @@ GntWidget *window; /* the container */ GntWidget *entry; /* entry */ GntWidget *tv; /* text-view */ + GntWidget *menu; /* future use */ union {
--- a/pidgin/gtkaccount.c Sun Apr 15 16:05:47 2007 +0000 +++ b/pidgin/gtkaccount.c Sun Apr 15 18:06:49 2007 +0000 @@ -2029,7 +2029,7 @@ gtk_notebook_set_current_page(GTK_NOTEBOOK(accounts_window->notebook),1); set_account(accounts_window->model, &iter, account, global_buddyicon); - gtk_window_present(pidgin_blist_get_default_gtk_blist()->window); + gtk_window_present(GTK_WINDOW(pidgin_blist_get_default_gtk_blist()->window)); } static gboolean
--- a/pidgin/gtkmain.c Sun Apr 15 16:05:47 2007 +0000 +++ b/pidgin/gtkmain.c Sun Apr 15 18:06:49 2007 +0000 @@ -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(); }
--- a/pidgin/gtkthemes.c Sun Apr 15 16:05:47 2007 +0000 +++ b/pidgin/gtkthemes.c Sun Apr 15 18:06:49 2007 +0000 @@ -141,6 +141,7 @@ } else if (load && list) { gboolean hidden = FALSE; char *sfile = NULL; + gboolean have_used_sfile = FALSE; if (*i == '!' && *(i + 1) == ' ') { hidden = TRUE; @@ -164,11 +165,14 @@ smiley->smile = g_strdup(l); smiley->hidden = hidden; list->smileys = g_slist_append(list->smileys, smiley); + have_used_sfile = TRUE; } while (isspace(*i)) i++; } + if (!have_used_sfile) + g_free(sfile); } }