Mercurial > pidgin.yaz
changeset 23927:128f1d7e12ff
Some cleanup and a little leak fix that I thought I committed a while ago.
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Thu, 28 Aug 2008 00:55:35 +0000 |
| parents | 4a5c8feb83e6 |
| children | 18f6ff443104 |
| files | pidgin/gtknotify.c |
| diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtknotify.c Thu Aug 28 00:54:37 2008 +0000 +++ b/pidgin/gtknotify.c Thu Aug 28 00:55:35 2008 +0000 @@ -50,7 +50,6 @@ PurpleAccount *account; char *url; GtkWidget *label; - GtkTreeIter iter; int count; gboolean purple_has_handle; } PidginNotifyMailData; @@ -128,7 +127,10 @@ purple_notify_uri(NULL, data->url); gtk_tree_store_remove(dialog->treemodel, &iter); - purple_notify_close(PURPLE_NOTIFY_EMAILS, data); + if (data->purple_has_handle) + purple_notify_close(PURPLE_NOTIFY_EMAILS, data); + else + pidgin_close_notify(PURPLE_NOTIFY_EMAILS, data); if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(mail_dialog->treemodel), &iter)) return; @@ -487,13 +489,9 @@ PIDGIN_MAIL_TEXT, notification, PIDGIN_MAIL_DATA, data, -1); - data->iter = iter; /* XXX: Do we use this for something? */ data->account = account; data->count = count; - /* Why is this necessary?*/ - gtk_tree_model_get(GTK_TREE_MODEL(treemodel), &iter, - PIDGIN_MAIL_DATA, &data, -1); if (icon) g_object_unref(icon);