patches/gnome-commander-09-other.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 308 f12992850901
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
308
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     1
--- gnome-commander-1.2.4/src/utils.cc.orig	2007-06-12 11:33:38.649097000 +0100
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     2
+++ gnome-commander-1.2.4/src/utils.cc	2007-06-12 11:34:28.691277289 +0100
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     3
@@ -1283,7 +1283,12 @@
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     4
 gboolean patlist_matches (GList *pattern_list, const gchar *s)
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     5
 {
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     6
     for (GList *tmp = pattern_list; tmp; tmp = tmp->next)
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     7
+#ifdef _GNUC
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     8
         if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE|FNM_CASEFOLD) == 0)
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     9
+#else
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    10
+        // Omit FNM_CASEFOLD as it is a GNU extension.
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    11
+        if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE) == 0)
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    12
+#endif
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    13
             return TRUE;
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    14
 
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    15
     return FALSE;
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    16
--- gnome-commander-1.2.4/src/gnome-cmd-file-popmenu.cc.orig	2007-06-12 11:29:14.440296820 +0100
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    17
+++ gnome-commander-1.2.4/src/gnome-cmd-file-popmenu.cc	2007-06-12 11:32:06.691964917 +0100
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    18
@@ -283,7 +283,12 @@
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    19
             for (; files; files = files->next)
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    20
             {
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    21
                 gboolean ok = FALSE;
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    22
+#ifdef _GNUC
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    23
                 gint fn_flags = FNM_NOESCAPE | FNM_CASEFOLD;
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    24
+#else
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    25
+		// Omit FNM_CASEFOLD as it is a GNU extension.
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    26
+                gint fn_flags = FNM_NOESCAPE;
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    27
+#endif
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    28
 
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    29
                 GnomeCmdFile *finfo = (GnomeCmdFile *) files->data;
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    30
                 if (finfo->info->type != GNOME_VFS_FILE_TYPE_REGULAR)
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    31
--- gnome-commander-1.2.4/plugins/test/test-plugin.c.orig	2007-06-12 11:43:07.654477136 +0100
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    32
+++ gnome-commander-1.2.4/plugins/test/test-plugin.c	2007-06-12 11:44:06.081892357 +0100
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    33
@@ -43,6 +43,9 @@
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    34
 
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    35
 struct _TestPluginPrivate
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    36
 {
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    37
+#ifdef __sun
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    38
+  char x;  /* Sun's forte compiler does not line empty structs. */
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    39
+#endif
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    40
 };
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    41
 
f12992850901 2007-06-11 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    42
 static GnomeCmdPluginClass *parent_class = NULL;