diff options
author | A. Walton <awalton@svn.gnome.org> | 2008-04-10 19:40:56 +0000 |
---|---|---|
committer | Andrew Walton <awalton@src.gnome.org> | 2008-04-10 19:40:56 +0000 |
commit | 6eb74f59556c0b1ef6f92957138cbb0506284121 (patch) | |
tree | dbf72e6d36f0f42bbfc684bf067882f60eabfb5c | |
parent | 232e25a8c3a3a10e39d78727ea7b60efc14d2840 (diff) | |
download | nautilus-6eb74f59556c0b1ef6f92957138cbb0506284121.tar.gz |
Remove the first-time-druid dead code (#520773).
2008-04-10 A. Walton <awalton@svn.gnome.org>
* src/Makefile.am:
* src/nautilus-application.c: (nautilus_application_startup):
* src/nautilus-application.h:
* src/nautilus-first-time-druid.c:
* src/nautilus-first-time-druid.h:
* src/nautilus-main.c: (main):
Remove the first-time-druid dead code (#520773).
svn path=/trunk/; revision=14061
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/nautilus-application.c | 2 | ||||
-rw-r--r-- | src/nautilus-application.h | 1 | ||||
-rw-r--r-- | src/nautilus-first-time-druid.c | 54 | ||||
-rw-r--r-- | src/nautilus-first-time-druid.h | 34 | ||||
-rw-r--r-- | src/nautilus-main.c | 1 |
7 files changed, 10 insertions, 94 deletions
@@ -1,3 +1,13 @@ +2008-04-10 A. Walton <awalton@svn.gnome.org> + + * src/Makefile.am: + * src/nautilus-application.c: (nautilus_application_startup): + * src/nautilus-application.h: + * src/nautilus-first-time-druid.c: + * src/nautilus-first-time-druid.h: + * src/nautilus-main.c: (main): + Remove the first-time-druid dead code (#520773). + 2008-04-10 Cosimo Cecchi <cosimoc@gnome.org> * configure.in: Add a missing comma to fix build with diff --git a/src/Makefile.am b/src/Makefile.am index 12314e341..fdacebcf4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -75,8 +75,6 @@ nautilus_SOURCES = \ nautilus-emblem-sidebar.h \ nautilus-file-management-properties.c \ nautilus-file-management-properties.h \ - nautilus-first-time-druid.c \ - nautilus-first-time-druid.h \ nautilus-history-sidebar.c \ nautilus-history-sidebar.h \ nautilus-image-properties-page.c \ diff --git a/src/nautilus-application.c b/src/nautilus-application.c index 134115d67..0c0611c81 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -48,7 +48,6 @@ #include <fcntl.h> #include <string.h> #include "nautilus-desktop-window.h" -#include "nautilus-first-time-druid.h" #include "nautilus-main.h" #include "nautilus-spatial-window.h" #include "nautilus-navigation-window.h" @@ -540,7 +539,6 @@ nautilus_application_startup (NautilusApplication *application, gboolean restart_shell, gboolean no_default_window, gboolean no_desktop, - gboolean do_first_time_druid_check, gboolean browser_window, const char *startup_id, const char *geometry, diff --git a/src/nautilus-application.h b/src/nautilus-application.h index 258ea6814..29e7edd6d 100644 --- a/src/nautilus-application.h +++ b/src/nautilus-application.h @@ -72,7 +72,6 @@ void nautilus_application_startup (NautilusApplication gboolean restart_shell, gboolean no_default_window, gboolean no_desktop, - gboolean do_first_time_druid_check, gboolean browser_window, const char *startup_id, const char *default_geometry, diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c deleted file mode 100644 index 42d6114dc..000000000 --- a/src/nautilus-first-time-druid.c +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - -/* - * Nautilus - * - * Copyright (C) 2000 Eazel, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Author: Andy Hertzfeld <andy@eazel.com> - */ - -#include <config.h> -#include "nautilus-first-time-druid.h" - -#include <glib/gi18n.h> -#include <libnautilus-private/nautilus-file-utilities.h> -#include <stdio.h> -#include <string.h> - -void -nautilus_set_first_time_file_flag (void) -{ - FILE *stream; - char *user_directory, *druid_flag_file_name; - const char * const blurb = - _("Existence of this file indicates that the Nautilus configuration druid\n" - "has been presented.\n\n" - "You can manually erase this file to present the druid again.\n"); - - user_directory = nautilus_get_user_directory (); - druid_flag_file_name = g_build_filename (user_directory, "first-time-flag", NULL); - g_free (user_directory); - - stream = fopen (druid_flag_file_name, "w"); - if (stream != NULL) { - fwrite (blurb, sizeof (char), strlen (blurb), stream); - fclose (stream); - } - g_free (druid_flag_file_name); -} diff --git a/src/nautilus-first-time-druid.h b/src/nautilus-first-time-druid.h deleted file mode 100644 index 5b357bfd4..000000000 --- a/src/nautilus-first-time-druid.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - -/* - * Nautilus - * - * Copyright (C) 2000 Eazel, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Author: Andy Hertzfeld <andy@eazel.com> - */ - -/* nautilus-first-time-druid.h: definition file for the first time druid - */ - -#ifndef NAUTILUS_FIRST_TIME_DRUID_H -#define NAUTILUS_FIRST_TIME_DRUID_H - -void nautilus_set_first_time_file_flag (void); - -#endif /* NAUTILUS_FIRST_TIME_DRUID_H */ diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 136866b32..11ed66feb 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -554,7 +554,6 @@ main (int argc, char *argv[]) nautilus_application_startup (application, kill_shell, restart_shell, no_default_window, no_desktop, - !(kill_shell || restart_shell), browser_window, startup_id_copy, geometry, |