Merge lp:~rodrigo-moya/evolution-indicator/port-to-3-0 into lp:evolution-indicator

[Rodrigo Moya]

Make it build with evolution 3.0 stack

[Didier Roche-Tolomelli (didrocks)]

The changes seems good, but evolution is now using libgtkhtml-editor-4.0.pc and not 3.14 anymore. Can you make the change so that we can drop 3.14 from the CD?

review: Needs Information

[Didier Roche-Tolomelli (didrocks)]

just to be a little bit more clear,

22 + GTKHTML_EDITOR=gtkhtml-editor-3.14,
is in PKG_CHECK_EXISTS(evolution-plugin, which seems to be the 2.0 version, but this PKG_CHECK_EXISTS is itself in 17 +PKG_CHECK_EXISTS(evolution-plugin-3.0,
hence the fact I'm puzzled :)

[lp:~rodrigo-moya/evolution-indicator/port-to-3-0]

79. By Rodrigo Moya on 2011-05-27

Fix C&P code

[Didier Roche-Tolomelli (didrocks)]

after discussion on IRC, approved then :)

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-02-25 18:17:25 +0000
+++ configure.ac	2011-05-27 12:30:27 +0000
@@ -11,6 +11,8 @@
 AC_STDC_HEADERS
 AC_PROG_LIBTOOL
 
+PKG_PROG_PKG_CONFIG
+
 AC_ARG_ENABLE([deprecations],
   [AS_HELP_STRING([--enable-deprecations],
     [allow deprecated API usage @<:@default=yes@:>@])],
@@ -25,11 +27,20 @@
 
 with_localinstall="no"
 
+PKG_CHECK_EXISTS(evolution-plugin-3.0,
+	EVOLUTION_PLUGIN=evolution-plugin-3.0
+	GTKHTML_EDITOR=gtkhtml-editor-4.0,
+	PKG_CHECK_EXISTS(evolution-plugin,
+		EVOLUTION_PLUGIN=evolution-plugin
+		GTKHTML_EDITOR=gtkhtml-editor-3.14,
+		AC_MSG_ERROR(You need evolution-plugin to compile evolution-indicator))
+	)
+
 AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install in the local build directory instead of the system one (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
 if test "x$with_localinstall" = "xyes"; then
 	EVO_PLUGIN_DIR="${libdir}/evolution/2.26/plugins"
 else
-	EVO_PLUGIN_DIR=`pkg-config --variable=plugindir evolution-plugin`
+	EVO_PLUGIN_DIR=`pkg-config --variable=plugindir $EVOLUTION_PLUGIN `
 fi
 AC_SUBST(EVO_PLUGIN_DIR)
 
@@ -60,18 +71,18 @@
 
 PKG_CHECK_MODULES(DEPS,
                   indicate-0.5 >= 0.4.91
-                  evolution-plugin
+                  $EVOLUTION_PLUGIN
                   dbus-1
                   dbus-glib-1
                   libnotify
                   libcanberra
-                  gtkhtml-editor-3.14
+                  $GTKHTML_EDITOR
                   unity
                   )
 AC_SUBST(DEPS_CFLAGS)
 AC_SUBST(DEPS_LIBS)
 
-EVO_I18N_DOMAIN=`pkg-config --modversion evolution-plugin | sed -e 's/\(.*\)\..\+$/\1/'`
+EVO_I18N_DOMAIN=`pkg-config --modversion $EVOLUTION_PLUGIN | sed -e 's/\(.*\)\..\+$/\1/'`
 AC_DEFINE_UNQUOTED(EVO_I18N_DOMAIN,
                    "evolution-$EVO_I18N_DOMAIN",
                    [Define to the translation domain for Evolution])
 
=== modified file 'src/evolution-indicator.c'
--- src/evolution-indicator.c	2011-02-25 18:17:25 +0000
+++ src/evolution-indicator.c	2011-05-27 12:30:27 +0000
@@ -155,7 +155,11 @@
   }
 
   xwindow = None;
-  res = _wnck_get_window (GDK_WINDOW_XWINDOW (root), 
+#if GTK_CHECK_VERSION(2, 91, 0)
+  res = _wnck_get_window (GDK_WINDOW_XID (root), 
+#else
+  res = _wnck_get_window (GDK_WINDOW_XWINDOW (root),
+#endif
                     gdk_x11_get_xatom_by_name ("_NET_ACTIVE_WINDOW"),
                     &xwindow);
   if (res)
@@ -291,7 +295,7 @@
 
     if (notification == NULL)
     {
-      notification = notify_notification_new (" ", " ", "mail-unread", NULL);
+      notification = notify_notification_new (" ", " ", "mail-unread");
     }
 
     trans = g_dngettext (PACKAGE, 
@@ -917,10 +921,17 @@
 
     label2 = gtk_label_new (" ");
 
+#if GTK_CHECK_VERSION(2, 91, 0)
+    combo = gtk_combo_box_text_new ();
+    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo),
+				    n_accounts > 1 ? _("any Inbox") : _("Inbox"));
+    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("any Folder"));
+#else
     combo = gtk_combo_box_new_text ();
     gtk_combo_box_append_text (GTK_COMBO_BOX (combo),
                                n_accounts > 1 ? _("any Inbox") : _("Inbox"));
     gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("any Folder"));
+#endif
     gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 
                               only_inbox ? 0 : 1);
     g_signal_connect (combo, "changed", G_CALLBACK (on_combo_changed), NULL);