ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #03642
[Branch ~indicator-applet-developers/evolution-indicator/trunk] Rev 80: Merged fixes from Mathieu Trudel-Lapierre updating to work with evolution 3.1
Merge authors:
Mathieu Trudel-Lapierre (mathieu-tl)
Related merge proposals:
https://code.launchpad.net/~mathieu-tl/evolution-indicator/url-source/+merge/66213
proposed by: Mathieu Trudel-Lapierre (mathieu-tl)
review: Approve - Ken VanDine (ken-vandine)
------------------------------------------------------------
revno: 80 [merge]
fixes bug(s): https://launchpad.net/bugs/803339
committer: Ken VanDine <ken.vandine@xxxxxxxxxxxxx>
branch nick: evolution-indicator
timestamp: Wed 2011-06-29 10:05:35 +0100
message:
Merged fixes from Mathieu Trudel-Lapierre updating to work with evolution 3.1
modified:
src/evolution-indicator.c
--
lp:evolution-indicator
https://code.launchpad.net/~indicator-applet-developers/evolution-indicator/trunk
Your team ayatana-commits is subscribed to branch lp:evolution-indicator.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/evolution-indicator/trunk/+edit-subscription
=== modified file 'src/evolution-indicator.c'
--- src/evolution-indicator.c 2011-05-27 10:57:30 +0000
+++ src/evolution-indicator.c 2011-06-28 22:10:50 +0000
@@ -227,14 +227,18 @@
void
org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)
{
- g_return_if_fail (t != NULL);
+ gchar *url;
+
+ g_return_if_fail (t != NULL);
+
+ url = camel_service_get_url (CAMEL_SERVICE (t->store));
if (!t->new)
return;
if (only_inbox && !(t->is_inbox))
{
- g_debug ("EI: %s is not an inbox", t->uri);
+ g_debug ("EI: %s is not an inbox", url);
return;
}
@@ -246,7 +250,7 @@
g_static_mutex_lock (&mlock);
- g_debug ("EI:mail_new_notify: %s", t->uri);
+ g_debug ("EI:mail_new_notify: %s", url);
message_count += t->new;
@@ -259,7 +263,7 @@
{
IndicateIndicator *indi = i->data;
- if (g_strstr_len (t->uri,
+ if (g_strstr_len (url,
-1,
indicate_indicator_get_property (indi, "url")))
{
@@ -280,7 +284,7 @@
}
else
{
- g_warning ("EI: Unable to find account that matches %s", t->uri);
+ g_warning ("EI: Unable to find account that matches %s", url);
}
}