patches/fsexam-01-remove-eel.diff
author gheet
Fri, 23 Apr 2010 14:52:41 +0000
changeset 17927 97b0295fad06
permissions -rw-r--r--
2010-04-23 Ghee Teo <[email protected]> Complete fix of doo#15000 for fsexam * patches/fsexam-01-remove-eel.diff: * specs/SUNWfsexam.spec:
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17927
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     1
diff -urB fsexam-0.8.1.orig/configure.in fsexam-0.8.1.hacked/configure.in
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     2
--- fsexam-0.8.1.orig/configure.in	2010-04-23 14:41:32.385944606 +0100
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     3
+++ fsexam-0.8.1.hacked/configure.in	2010-04-23 14:54:34.931729119 +0100
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     4
@@ -65,8 +65,7 @@
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     5
         [gnome-desktop-2.0 >= 2.0 \
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     6
         libgnomeui-2.0 >= 2.0     \
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     7
         libglade-2.0 >= 2.0       \
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     8
-        gnome-vfs-module-2.0 >= 2.0 \
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     9
-        eel-2.0 >= 2.2.3])
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    10
+        gnome-vfs-module-2.0 >= 2.0]) 
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    11
 
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    12
 PKG_CHECK_MODULES(DUMMY, 
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    13
         [glib-2.0 >= 2.8], 
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    14
diff -urB fsexam-0.8.1.orig/src/fsexam-dnd.c fsexam-0.8.1.hacked/src/fsexam-dnd.c
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    15
--- fsexam-0.8.1.orig/src/fsexam-dnd.c	2009-02-10 07:31:50.000000000 +0000
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    16
+++ fsexam-0.8.1.hacked/src/fsexam-dnd.c	2010-04-23 14:53:51.385616947 +0100
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    17
@@ -34,8 +34,6 @@
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    18
 #include <libgnome/libgnome.h>
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    19
 #include <libgnomeui/libgnomeui.h>
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    20
 #include <libgnomevfs/gnome-vfs.h>
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    21
-#include <eel/eel-vfs-extensions.h>
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    22
-#include <eel/eel-string.h>
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    23
 #include <stdio.h>
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    24
 
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    25
 #include "fsexam-header.h"
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    26
@@ -54,6 +52,41 @@
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    27
             {"x-special/gnome-icon-list", 0, FSEXAM_ICON_DND_GNOME_ICON_LIST}
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    28
 };
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    29
 
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    30
+static gboolean
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    31
+_uri_has_prefix (const char *haystack, const char *needle)
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    32
+{
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    33
+        const char *h, *n;
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    34
+        char hc, nc;
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    35
+
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    36
+        h = haystack == NULL ? "" : haystack;
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    37
+        n = needle == NULL ? "" : needle;
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    38
+        do {
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    39
+                if (*n == '\0') {
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    40
+                        return TRUE;
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    41
+                }
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    42
+                if (*h == '\0') {
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    43
+                        return FALSE;
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    44
+                }
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    45
+                hc = *h++;
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    46
+                nc = *n++;
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    47
+                hc = g_ascii_tolower (hc);
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    48
+                nc = g_ascii_tolower (nc);
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    49
+        } while (hc == nc);
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    50
+        return FALSE;
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    51
+}
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    52
+
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    53
+static gboolean 
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    54
+_uri_is_desktop (gchar *uri)
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    55
+{
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    56
+  return _uri_has_prefix (uri, "x-nautilus-desktop:");
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    57
+}
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    58
+
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    59
+static gboolean 
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    60
+_uri_is_trash (gchar *uri)
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    61
+{
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    62
+  return _uri_has_prefix (uri, "trash:");
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    63
+}
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    64
+
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    65
 static void
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    66
 drag_data_received_callback (GtkWidget *widget,
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    67
                              GdkDragContext *context,
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    68
@@ -93,8 +126,8 @@
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    69
     if (local_path) {
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    70
         fsexam_change_dir (local_path);
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    71
     } else {
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    72
-        if (eel_uri_is_desktop (canonical_uri) 
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    73
-                || eel_uri_is_trash (canonical_uri)) {
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    74
+        if (_uri_is_desktop (canonical_uri) 
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    75
+                || _uri_is_trash (canonical_uri)) {
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    76
             gchar *uri = NULL;
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    77
             p = strstr(canonical_uri, ":");
97b0295fad06 2010-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    78
             if (p != NULL) {