Merge lp:~cyphermox/evolution-indicator/0.2.17-0ubuntu1 into lp:~ubuntu-desktop/evolution-indicator/ubuntu

[Mathieu Trudel-Lapierre]

[Ken VanDine (ken-vandine)]

Looks good, thanks!

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-05-27 13:27:55 +0000
+++ ChangeLog	2011-06-29 09:24:43 +0000
@@ -1,5 +1,19 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ken VanDine  <[e-mail]>
+
+	Preparing for 0.2.17 
+
[phone]  Ken VanDine  <[e-mail]>
+
+	Merged fixes from Mathieu Trudel-Lapierre updating to work with evolution 3.1
+
[phone]  Mathieu Trudel-Lapierre  <[e-mail]>
+
+	Get the account URI from the CamelService object in EMEventTargetFolder
+	instead of directly from it; since it was removed in Evolution API
+	some time after 3.0.2.
+
 2011-05-27  Didier Roche  <[e-mail]>
 
 	[0.2.16] New release

=== modified file 'configure'
--- configure	2011-05-27 13:27:55 +0000
+++ configure	2011-06-29 09:24:43 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for evolution-indicator 0.2.16.
+# Generated by GNU Autoconf 2.68 for evolution-indicator 0.2.17.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@
 # Identity of this package.
 PACKAGE_NAME='evolution-indicator'
 PACKAGE_TARNAME='evolution-indicator'
-PACKAGE_VERSION='0.2.16'
-PACKAGE_STRING='evolution-indicator 0.2.16'
+PACKAGE_VERSION='0.2.17'
+PACKAGE_STRING='evolution-indicator 0.2.17'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1356,7 +1356,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures evolution-indicator 0.2.16 to adapt to many kinds of systems.
+\`configure' configures evolution-indicator 0.2.17 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1427,7 +1427,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of evolution-indicator 0.2.16:";;
+     short | recursive ) echo "Configuration of evolution-indicator 0.2.17:";;
    esac
   cat <<\_ACEOF
 
@@ -1549,7 +1549,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-evolution-indicator configure 0.2.16
+evolution-indicator configure 0.2.17
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1914,7 +1914,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by evolution-indicator $as_me 0.2.16, which was
+It was created by evolution-indicator $as_me 0.2.17, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2729,7 +2729,7 @@
 
 # Define the identity of the package.
  PACKAGE='evolution-indicator'
- VERSION='0.2.16'
+ VERSION='0.2.17'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14322,7 +14322,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by evolution-indicator $as_me 0.2.16, which was
+This file was extended by evolution-indicator $as_me 0.2.17, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14388,7 +14388,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-evolution-indicator config.status 0.2.16
+evolution-indicator config.status 0.2.17
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-05-27 13:38:36 +0000
+++ configure.ac	2011-06-29 09:24:43 +0000
@@ -1,5 +1,5 @@
 AC_PREREQ(2.53)
-AC_INIT(evolution-indicator, 0.2.16, [])
+AC_INIT(evolution-indicator, 0.2.17, [])
 AM_INIT_AUTOMAKE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR(src/evolution-indicator.c)

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-27 13:38:36 +0000
+++ debian/changelog	2011-06-29 09:24:43 +0000
@@ -1,3 +1,10 @@
+evolution-indicator (0.2.17-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Use new API for EMEventTargetFolder to retrieve account URI (LP: #803339)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 29 Jun 2011 05:12:53 -0400
+
 evolution-indicator (0.2.16-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.

=== modified file 'src/evolution-indicator.c'
--- src/evolution-indicator.c	2011-05-27 13:38:36 +0000
+++ src/evolution-indicator.c	2011-06-29 09:24:43 +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);
       }
     }