diff options
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 3 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.h | 3 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 2 | ||||
| -rw-r--r-- | src/empathy-main-window.c | 2 | ||||
| -rw-r--r-- | src/empathy-map-view.c | 4 | ||||
| -rw-r--r-- | src/empathy-status-icon.c | 2 |
6 files changed, 7 insertions, 9 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index b33760629..b91bf0313 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -1385,8 +1385,7 @@ empathy_window_iconify (GtkWindow *window, GtkStatusIcon *status_icon) /* Takes care of moving the window to the current workspace. */ void -empathy_window_present (GtkWindow *window, - gboolean steal_focus) +empathy_window_present (GtkWindow *window) { GdkWindow *gdk_window; diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h index 38732c7f9..8834cb4c9 100644 --- a/libempathy-gtk/empathy-ui-utils.h +++ b/libempathy-gtk/empathy-ui-utils.h @@ -104,8 +104,7 @@ gboolean empathy_text_iter_backward_search (const GtkTextIter*iter, const GtkTextIter*limit); /* Windows */ gboolean empathy_window_get_is_visible (GtkWindow *window); -void empathy_window_present (GtkWindow *window, - gboolean steal_focus); +void empathy_window_present (GtkWindow *window); void empathy_window_iconify (GtkWindow *window, GtkStatusIcon *status_icon); GtkWindow * empathy_get_toplevel_window (GtkWidget *widget); diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 158faa0b1..96484172c 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -2242,7 +2242,7 @@ empathy_chat_window_present_chat (EmpathyChat *chat) priv = GET_PRIV (window); empathy_chat_window_switch_to_chat (window, chat); - empathy_window_present (GTK_WINDOW (priv->dialog), TRUE); + empathy_window_present (GTK_WINDOW (priv->dialog)); gtk_widget_grab_focus (chat->input_text_view); } diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 7c8aad496..fe9af9c4d 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -1306,7 +1306,7 @@ empathy_main_window_show (void) GSList *l; if (main_window) { - empathy_window_present (GTK_WINDOW (main_window->window), TRUE); + empathy_window_present (GTK_WINDOW (main_window->window)); return main_window->window; } diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c index fd6106c95..287d9b6ff 100644 --- a/src/empathy-map-view.c +++ b/src/empathy-map-view.c @@ -351,7 +351,7 @@ empathy_map_view_show (void) if (window) { - empathy_window_present (GTK_WINDOW (window->window), TRUE); + empathy_window_present (GTK_WINDOW (window->window)); return window->window; } @@ -415,7 +415,7 @@ empathy_map_view_show (void) model = GTK_TREE_MODEL (window->list_store); gtk_tree_model_foreach (model, map_view_contacts_foreach, window); - empathy_window_present (GTK_WINDOW (window->window), TRUE); + empathy_window_present (GTK_WINDOW (window->window)); /* Set up time updating loop */ window->timeout_id = g_timeout_add_seconds (5, diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index d0cdac314..d1ea96c98 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -362,7 +362,7 @@ status_icon_set_visibility (EmpathyStatusIcon *icon, if (!visible) { empathy_window_iconify (priv->window, priv->icon); } else { - empathy_window_present (GTK_WINDOW (priv->window), TRUE); + empathy_window_present (GTK_WINDOW (priv->window)); } } |