Merge branch 'people-nearby-fake-group-613558'

[empathy.git] / src / empathy-main-window.c

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 7c8aad496348f8b5a6d50b7a5882aee348b1021a..635627e742c865a6240389858c99223ba67e71e1 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -362,7 +362,7 @@ main_window_error_edit_clicked_cb (GtkButton *button,
        account = g_object_get_data (G_OBJECT (button), "account");
 
        empathy_accounts_dialog_show_application (
-                       gtk_widget_get_screen (GTK_WIDGET (button)), NULL, NULL,
+                       gtk_widget_get_screen (GTK_WIDGET (button)),
                        account, FALSE, FALSE);
 
        main_window_remove_error (window, account);
@@ -424,6 +424,7 @@ main_window_error_display (EmpathyMainWindow *window,
        label = gtk_label_new (str);
        gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
        gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+       gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
        gtk_widget_show (label);
        g_free (str);
 
@@ -1068,7 +1069,7 @@ main_window_edit_accounts_cb (GtkAction         *action,
                              EmpathyMainWindow *window)
 {
        empathy_accounts_dialog_show_application (gdk_screen_get_default (),
-                       NULL, NULL, NULL, FALSE, FALSE);
+                       NULL, FALSE, FALSE);
 }
 
 static void
@@ -1116,7 +1117,7 @@ main_window_help_debug_cb (GtkAction         *action,
        argv[i++] = path;
 
        gdk_spawn_on_screen (screen, NULL, argv, NULL,
-                       G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+                       G_SPAWN_SEARCH_PATH,
                        NULL, NULL, NULL, &error);
 
        if (error) {
@@ -1146,7 +1147,7 @@ main_window_throbber_button_press_event_cb (GtkWidget         *throbber_ebox,
 
        empathy_accounts_dialog_show_application (
                        gtk_widget_get_screen (GTK_WIDGET (throbber_ebox)),
-                       NULL, NULL, NULL, FALSE, FALSE);
+                       NULL, FALSE, FALSE);
 
        return FALSE;
 }
@@ -1306,7 +1307,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;
        }