patches/nautilus-10-star-desktop.diff
author erwannc
Mon, 08 Sep 2008 15:52:03 +0000
changeset 13439 9fda05be38db
child 14836 bc662659c4ff
permissions -rw-r--r--
2008-09-08 Erwann Chenede - <[email protected]> * patches/nautilus-13-zfs-snapshot.diff : initial implementation for 6738643. * patches/nautilus-09-interface-changes-indiana.diff : patch rename * patches/nautilus-14-interface-changes-indiana.diff * patches/nautilus-10-trusted-extensions.diff * patches/nautilus-13-blank-cd.diff * patches/nautilus-11-star-desktop.diff * patches/nautilus-09-interface-changes.diff * patches/nautilus-12-update-bookmarks.diff * patches/nautilus-14-interface-changes.diff * base-specs/nautilus.spec : added, renamed and reorder patches.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13439
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     1
--- /usr/tmp/clean/nautilus-2.20.0/src/nautilus-application.c	2007-09-10 07:56:43.000000000 +0100
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     2
+++ nautilus-2.20.0/src/nautilus-application.c	2007-11-23 09:51:37.396201000 +0000
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     3
@@ -421,6 +421,35 @@
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     4
 }
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     5
 
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     6
 static void
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     7
+check_star_icon (void)
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     8
+{
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     9
+	char *desktop_file;
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    10
+	char *system_file;
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    11
+	char *desktop_path;
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    12
+	struct stat desktop_buf;
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    13
+
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    14
+	desktop_path = nautilus_get_desktop_directory ();
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    15
+	desktop_file = g_build_filename (desktop_path,
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    16
+				 	 "star.desktop",
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    17
+					 NULL);
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    18
+	if (g_stat (desktop_file, &desktop_buf) == 0) {
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    19
+		struct stat system_buf;
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    20
+		system_file = g_build_filename (DATADIR "/applications",
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    21
+					        "star.desktop",
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    22
+						NULL);
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    23
+		if (g_stat (system_file, &system_buf) == 0) {
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    24
+			if (desktop_buf.st_size != system_buf.st_size) {
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    25
+				g_unlink(desktop_file);
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    26
+			}
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    27
+		}
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    28
+		g_free (system_file);
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    29
+	}
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    30
+
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    31
+	g_free (desktop_file);
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    32
+	g_free (desktop_path);
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    33
+}
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    34
+
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    35
+static void
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    36
 initialize_kde_trash_hack (void)
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    37
 {
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    38
 	char *trash_dir;
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    39
@@ -524,6 +553,8 @@
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    40
 		return;
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    41
 	}
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    42
 
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    43
+	check_star_icon();
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    44
+ 
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    45
 	initialize_kde_trash_hack ();
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    46
 
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    47
 	CORBA_exception_init (&ev);