summaryrefslogtreecommitdiffstats
path: root/x11/gcursor/files/patch-src::gcursor.c
blob: 583eac0fd36dfa8f14b871036f8da4cba7925eb1 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
--- src/gcursor.c.orig  Thu Aug 26 05:35:55 2004
+++ src/gcursor.c   Thu Jul 27 13:25:46 2006
@@ -32,29 +32,22 @@
 
 #warning move this into gconf
 char *paths[] = {
-   "/usr/share/cursors/xfree/",
-   "/usr/X11R6/lib/X11/icons/",
-   "/usr/Xorg/lib/X11/icons/",
-   "/usr/local/share/icons/",
-   "/usr/share/icons/",
+   "%%LOCALBASE%%/lib/X11/icons/",
+   "%%X11BASE%%/lib/X11/icons/",
    "%s/.icons/",
    NULL
 }; 
 
 void open_theme_dir()
 {
-   GError  * error = NULL;
-   char    * filename;
-   
-   filename = g_strdup_printf("file:///%s/.icons/", g_getenv("HOME"));
-   gnome_url_show(filename,&error);
-   g_free(filename);
+   gchar *path, *command;
 
-   if (error)
-   {
-       gnome_warning_dialog (error->message);
-       g_error_free (error);
-   }
+   path = g_strdup_printf ("%s/.icons", g_get_home_dir());
+   command = g_strdup_printf ("nautilus --no-desktop %s", path);
+
+   g_free (path);
+   g_spawn_command_line_async (command, NULL);
+   g_free (command);
 }
 
 
@@ -85,7 +78,7 @@
            filename = g_shell_quote(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs)));
 #endif
 
-       path = g_strdup_printf("file-roller --extract-to=%s/.icons/ %s", g_getenv("HOME"), 
+       path = g_strdup_printf("file-roller --extract-to=%s/.icons/ %s", g_get_home_dir(), 
                filename);
        g_free(filename);
 
@@ -281,7 +274,7 @@
    
    for (iterator = paths; *iterator; iterator++)
    {
-       dirname = g_strdup_printf(*iterator, g_getenv("HOME"));
+       dirname = g_strdup_printf(*iterator, g_get_home_dir());
        directory = g_dir_open(dirname, 0, NULL);
        
        while(directory != NULL && (name = g_dir_read_name(directory)) != NULL)