/* Takes care of moving the window to the current workspace. */
void
-empathy_window_present (GtkWindow *window)
+empathy_window_present_with_time (GtkWindow *window,
+ guint32 timestamp)
{
GdkWindow *gdk_window;
- guint32 timestamp;
g_return_if_fail (GTK_IS_WINDOW (window));
gtk_window_deiconify (window);
}
+void
+empathy_window_present (GtkWindow *window)
+{
+ empathy_window_present_with_time (window, GDK_CURRENT_TIME);
+}
+
GtkWindow *
empathy_get_toplevel_window (GtkWidget *widget)
{
const GtkTextIter*limit);
/* Windows */
gboolean empathy_window_get_is_visible (GtkWindow *window);
-void empathy_window_present (GtkWindow *window);
+void empathy_window_present (GtkWindow *window);
+void empathy_window_present_with_time (GtkWindow *window,
+ guint32 timestamp);
void empathy_window_iconify (GtkWindow *window,
GtkStatusIcon *status_icon);
GtkWindow * empathy_get_toplevel_window (GtkWidget *widget);
empathy_chat_window_add_chat (window, chat);
}
+ /* Don't force the window to show itself when it wasn't
+ * an action by the user
+ */
+ if (timestamp == EMPATHY_DISPATCHER_NON_USER_ACTION)
+ return;
+
priv = GET_PRIV (window);
empathy_chat_window_switch_to_chat (window, chat);
- empathy_window_present (GTK_WINDOW (priv->dialog));
+ empathy_window_present_with_time (GTK_WINDOW (priv->dialog),
+ CLAMP (timestamp, 0, G_MAXUINT32));
gtk_widget_grab_focus (chat->input_text_view);
}