ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/evolution-indicator/libindicate-update/+merge/20622
  proposed by: Ted Gould (ted)
  review: Approve - David Barth (dbarth)
------------------------------------------------------------
revno: 58 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-03-04 09:03:16 -0600
message:
  Updating to signals from new libindicate and using the timestamps.
modified:
  configure.ac
  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 'configure.ac'
--- configure.ac	2010-01-21 16:22:32 +0000
+++ configure.ac	2010-03-04 04:45:32 +0000
@@ -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 'src/evolution-indicator.c'
--- src/evolution-indicator.c	2009-12-17 14:59:03 +0000
+++ src/evolution-indicator.c	2010-03-04 04:41:47 +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);
@@ -945,52 +945,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 +985,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;