From 374bd42f69aca2e132fd854c9619f3d7491f1f96 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 12 Jul 2009 23:33:07 -0400 Subject: Fix excessive whitespace. --- shell/e-shell-importer.c | 2 -- shell/main.c | 33 ++++++++++++++------------------- 2 files changed, 14 insertions(+), 21 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index c11797631b..e8185fac3b 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -159,7 +159,6 @@ create_help (const gchar *name) if (i >= num_info) g_warning ("i > num_info\n"); - label = gtk_label_new(i < num_info ? _(info[i].text): NULL); gtk_widget_show (label); gtk_label_set_line_wrap((GtkLabel *)label, TRUE); @@ -731,7 +730,6 @@ e_shell_importer_start_import (EShellWindow *shell_window) gtk_box_pack_start (GTK_BOX (GNOME_DRUID_PAGE_STANDARD (data->intelligent)->vbox), data->importerpage->vbox, TRUE, TRUE, 0); - /* File selection and file type page */ data->filedialog = glade_xml_get_widget (data->wizard, "page2-file"); gnome_druid_page_standard_set_logo (GNOME_DRUID_PAGE_STANDARD (data->filedialog), icon); diff --git a/shell/main.c b/shell/main.c index 049ddce46a..bd77c21ea7 100644 --- a/shell/main.c +++ b/shell/main.c @@ -204,7 +204,6 @@ categories_icon_theme_hack (void) g_free (dirname); } - #ifdef DEVELOPMENT /* Warning dialog to scare people off a little bit. */ @@ -456,7 +455,7 @@ set_paths (void) components_folder_utf8, g_getenv ("PATH"), NULL); if (!g_setenv ("PATH", path, TRUE)) g_warning ("Could not set PATH for Evolution " - "and its child processes"); + "and its child processes"); g_free (path); g_free (exe_folder_utf8); @@ -524,26 +523,22 @@ gint main (gint argc, gchar **argv) { #ifdef G_OS_WIN32 - if (fileno (stdout) != -1 && - _get_osfhandle (fileno (stdout)) != -1) - { - /* stdout is fine, presumably redirected to a file or pipe */ - } - else - { - typedef BOOL (* WINAPI AttachConsole_t) (DWORD); + if (fileno (stdout) != -1 && _get_osfhandle (fileno (stdout)) != -1) { + /* stdout is fine, presumably redirected to a file or pipe */ + } else { + typedef BOOL (* WINAPI AttachConsole_t) (DWORD); - AttachConsole_t p_AttachConsole = - (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole"); + AttachConsole_t p_AttachConsole = + (AttachConsole_t) GetProcAddress ( + GetModuleHandle ("kernel32.dll"), "AttachConsole"); - if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS)) + if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS)) { - freopen ("CONOUT$", "w", stdout); - dup2 (fileno (stdout), 1); - freopen ("CONOUT$", "w", stderr); - dup2 (fileno (stderr), 2); - - } + freopen ("CONOUT$", "w", stdout); + dup2 (fileno (stdout), 1); + freopen ("CONOUT$", "w", stderr); + dup2 (fileno (stderr), 2); + } } extern void link_shutdown (void); -- cgit