2008-12-01  Alexander Larsson  <alexl@redhat.com>

        * POTFILES.in:
        * POTFILES.skip:
	Update

2008-12-01  Alexander Larsson  <alexl@redhat.com>

        * src/nautilus-main.c:
	Don't crash if nautilus.desktop is not installed (i.e. at make check)


svn path=/trunk/; revision=14793
This commit is contained in:
Alexander Larsson 2008-12-01 11:14:13 +00:00 committed by Alexander Larsson
parent 64b104f156
commit 3772f8f6dc
5 changed files with 19 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2008-12-01 Alexander Larsson <alexl@redhat.com>
* src/nautilus-main.c:
(main):
Don't crash if nautilus.desktop is not installed (i.e. at make check)
2008-12-01 Alexander Larsson <alexl@redhat.com>
* NEWS:

View file

@ -1,3 +1,9 @@
2008-12-01 Alexander Larsson <alexl@redhat.com>
* POTFILES.in:
* POTFILES.skip:
Update
2008-11-11 Mark Krapivner <mark125@gmail.com>
* he.po: Fixed a few errors

View file

@ -1,6 +1,8 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
[encoding: UTF-8]
cut-n-paste-code/libegg/eggdesktopfile.c
cut-n-paste-code/libegg/eggsmclient.c
data/browser.xml
data/nautilus.xml.in
libnautilus-extension/nautilus-column.c
@ -37,6 +39,7 @@ libnautilus-private/nautilus-tree-view-drag-dest.c
libnautilus-private/nautilus-undo-signal-handlers.c
libnautilus-private/nautilus-vfs-file.c
nautilus-autorun-software.desktop.in.in
nautilus-browser.desktop.in.in
nautilus-computer.desktop.in.in
nautilus-file-management-properties.desktop.in.in
nautilus-folder-handler.desktop.in.in

View file

@ -7,3 +7,4 @@ nautilus-file-management-properties.desktop.in
nautilus-folder-handler.desktop.in
nautilus-home.desktop.in
nautilus.desktop.in
nautilus-browser.desktop.in

View file

@ -374,7 +374,9 @@ main (int argc, char *argv[])
browser_window = FALSE;
g_set_prgname ("nautilus");
egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
}
context = g_option_context_new (_("\n\nBrowse the file system with the file manager"));
g_option_context_add_main_entries (context, options, NULL);