Merge lp:~cyphermox/evolution-indicator/url-source into lp:evolution-indicator

[Mathieu Trudel-Lapierre]

Fix URL retrieval after evo got updated to past 3.0.2. Evo API changes and no longer directly exposes the URL of the account store.

[Ken VanDine (ken-vandine)]

Looks good, thanks!

review: Approve

=== 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:16:12 +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);
       }
     }