Merge lp:~indicator-applet-developers/evolution-indicator/ubuntu into lp:~ubuntu-desktop/evolution-indicator/ubuntu

[Ted Gould]

0.2.7

[Ken VanDine (ken-vandine)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2010-01-21 21:26:00 +0000
+++ configure.ac	2010-03-09 15:30:37 +0000
@@ -1,5 +1,5 @@
 AC_PREREQ(2.53)
-AC_INIT(evolution-indicator, 0.2.6, [])
+AC_INIT(evolution-indicator, 0.2.7, [])
 AM_INIT_AUTOMAKE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR(src/evolution-indicator.c)
@@ -51,7 +51,7 @@
 AC_SUBST(GCC_FLAGS)
 
 PKG_CHECK_MODULES(DEPS,
-                  indicate >= 0.2.0
+                  indicate >= 0.3.0
                   evolution-plugin
                   dbus-1
                   dbus-glib-1

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-25 17:48:12 +0000
+++ debian/changelog	2010-03-09 15:30:37 +0000
@@ -1,3 +1,12 @@
+evolution-indicator (0.2.7-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Upstream Release 0.2.7
+    * Update to newer libindicate signaling
+    * Add in dynamic command items.
+  * debian/control: No depending on libindicate 0.3.0 or higher.
+
+ -- Ted Gould <[e-mail]>  Thu, 04 Mar 2010 11:28:52 -0600
+
 evolution-indicator (0.2.6-0ubuntu3) lucid; urgency=low
 
   * Rebuild to get the new gtkhtml shlib

=== modified file 'debian/control'
--- debian/control	2009-09-10 15:26:57 +0000
+++ debian/control	2010-03-09 15:30:37 +0000
@@ -14,7 +14,7 @@
   libdbus-glib-1-dev (>= 0.7),
   evolution-dev,
   evolution-data-server-dev,
-  libindicate-dev (>= 0.2.0),
+  libindicate-dev (>= 0.3.0),
   libnotify-dev,
   libcanberra-dev,
   libgtkhtml-editor-dev,

=== modified file 'src/evolution-indicator.c'
--- src/evolution-indicator.c	2009-12-17 14:59:03 +0000
+++ src/evolution-indicator.c	2010-03-09 15:30:37 +0000
@@ -100,7 +100,7 @@
 int         e_plugin_lib_enable               (EPluginLib *ep, int enable);
 GtkWidget * e_plugin_lib_get_configure_widget (EPlugin *epl);
 
-static void show_evolution (gpointer arg0, gpointer arg1);
+static void show_evolution (gpointer arg0, guint timestamp, gpointer arg1);
 
 static void show_evolution_in_indicator_applet (void);
 static void hide_evolution_in_indicator_applet (void);
@@ -671,6 +671,19 @@
   update_accounts ();
 }
 
+#define EVO_CONTACTS_CMD  "evolution -c contacts"
+#define EVO_COMPOSE_CMD   "evolution mailto:"
+
+static void
+command_item_activate (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data)
+{
+	gchar * command = (gchar *)user_data;
+	if (!g_spawn_command_line_async(command, NULL)) {
+		g_warning("Unable to execute command '%s'", command);
+	}
+	return;
+}
+
 int
 e_plugin_lib_enable (EPluginLib *ep, int enable)
 {
@@ -710,6 +723,22 @@
     g_signal_connect (server, "server-display",
                       G_CALLBACK (show_evolution), NULL);
 
+	DbusmenuServer * menu_server = dbusmenu_server_new("/messaging/commands");
+	DbusmenuMenuitem * root = dbusmenu_menuitem_new();
+
+	DbusmenuMenuitem * mi = dbusmenu_menuitem_new();
+	dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Compose New Message"));
+	g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(command_item_activate), EVO_COMPOSE_CMD);
+	dbusmenu_menuitem_child_append(root, mi);
+
+	mi = dbusmenu_menuitem_new();
+	dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Contacts"));
+	g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(command_item_activate), EVO_CONTACTS_CMD);
+	dbusmenu_menuitem_child_append(root, mi);
+
+	dbusmenu_server_set_root(menu_server, root);
+	indicate_server_set_menu(server, menu_server);
+
     client = gconf_client_get_default ();
     gconf_client_add_dir (client, CONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
 
@@ -945,52 +974,8 @@
  *
  */
 
-/*
- * Taken from libtomboy, (C) 2008 Novell, LGPL v2 or later
- */
-static void
-tomboy_window_override_user_time (GtkWindow *window)
-{
-	guint32 ev_time = gtk_get_current_event_time();
-
-	if (ev_time == 0) {
-		/* 
-		 * FIXME: Global keypresses use an event filter on the root
-		 * window, which processes events before GDK sees them.
-		 */
-		//ev_time = tomboy_keybinder_get_current_event_time ();
-    ev_time = GDK_CURRENT_TIME;
-	}
-	if (ev_time == 0) {
-		gint ev_mask = gtk_widget_get_events (GTK_WIDGET(window));
-		if (!(ev_mask & GDK_PROPERTY_CHANGE_MASK)) {
-			gtk_widget_add_events (GTK_WIDGET (window),
-					       GDK_PROPERTY_CHANGE_MASK);
-		}
-
-		/* 
-		 * NOTE: Last resort for D-BUS or other non-interactive
-		 *       openings.  Causes roundtrip to server.  Lame. 
-		 */
-		ev_time = gdk_x11_get_server_time (GTK_WIDGET(window)->window);
-	}
-
-	gdk_x11_window_set_user_time (GTK_WIDGET(window)->window, ev_time);
-}
-
-static void 
-really_present_window (GtkWindow *window)
-{
-	if (!GTK_WIDGET_REALIZED (window))
-		gtk_widget_realize (GTK_WIDGET (window));
-
-	tomboy_window_override_user_time (window);
-
-	gtk_window_present (window);
-}
-
-static void
-show_evolution (gpointer arg0, gpointer arg1)
+static void
+show_evolution (gpointer arg0, guint timestamp, gpointer arg1)
 {
 #define MAIL_ICON "evolution-mail"
   EShell *shell = evo_shell;
@@ -1029,7 +1014,8 @@
         return;
     }
 
-    really_present_window (mail_window);
+    gtk_window_present_with_time (mail_window, timestamp);
+
     for (i = indicators; i; i = i->next)
     {
       IndicateIndicator *indicator = i->data;