gtk2.0 2.24.27
[git/cygwin-packages/gtk2.0.git] / 2.18.3-not-win32.patch
CommitLineData
0ca41f45 1--- origsrc/gtk+-2.18.3/gtk/fnmatch.c 2009-06-04 14:18:03.000000000 -0500
2+++ src/gtk+-2.18.3/gtk/fnmatch.c 2009-10-25 17:05:14.809817100 -0500
3@@ -47,14 +47,14 @@ get_char (const char **str)
4 gunichar c = g_utf8_get_char (*str);
5 *str = g_utf8_next_char (*str);
6
7-#ifdef G_PLATFORM_WIN32
8+#ifdef G_OS_WIN32
9 c = g_unichar_tolower (c);
10 #endif
11
12 return c;
13 }
14
15-#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
16+#if defined(G_OS_WIN32)
17 #define DO_ESCAPE 0
18 #else
19 #define DO_ESCAPE 1
20--- origsrc/gtk+-2.18.3/gtk/gtkfilechooserentry.c 2009-06-04 14:18:04.000000000 -0500
21+++ src/gtk+-2.18.3/gtk/gtkfilechooserentry.c 2009-10-25 17:05:40.300261500 -0500
22@@ -408,7 +408,7 @@ completion_match_func (GtkEntryCompletio
23 norm_file_part = g_utf8_normalize (chooser_entry->file_part, -1, G_NORMALIZE_ALL);
24 norm_name = g_utf8_normalize (name, -1, G_NORMALIZE_ALL);
25
26-#ifdef G_PLATFORM_WIN32
27+#ifdef G_OS_WIN32
28 {
29 gchar *temp;
30
31--- origsrc/gtk+-2.18.3/gtk/gtkfilesel.c 2009-10-09 00:00:44.000000000 -0500
32+++ src/gtk+-2.18.3/gtk/gtkfilesel.c 2009-10-25 17:08:08.219719400 -0500
33@@ -45,12 +45,12 @@
34 #include <glib.h> /* Include early to get G_OS_WIN32 etc */
35 #include <glib/gstdio.h>
36
37-#if defined(G_PLATFORM_WIN32)
38+#if defined(G_OS_WIN32)
39 #include <ctype.h>
40 #define STRICT
41 #include <windows.h>
42 #undef STRICT
43-#endif /* G_PLATFORM_WIN32 */
44+#endif /* G_OS_WIN32 */
45
46 #include "gdk/gdkkeysyms.h"
47
48@@ -151,7 +151,7 @@ typedef struct _PossibleCompletion Possi
49 */
50 struct _CompletionDirSent
51 {
52-#ifndef G_PLATFORM_WIN32
53+#ifndef G_OS_WIN32
54 ino_t inode;
55 time_t mtime;
56 dev_t device;
57@@ -323,7 +323,7 @@ static gchar* cmpl_completi
58 static CompletionDir* open_ref_dir (gchar* text_to_complete,
59 gchar** remaining_text,
60 CompletionState* cmpl_state);
61-#ifndef G_PLATFORM_WIN32
62+#ifndef G_OS_WIN32
63 static gboolean check_dir (gchar *dir_name,
64 struct stat *result,
65 gboolean *stat_subdirs);
66@@ -342,7 +342,7 @@ static CompletionDirSent* open_new_dir
67 static gint correct_dir_fullname (CompletionDir* cmpl_dir);
68 static gint correct_parent (CompletionDir* cmpl_dir,
69 struct stat *sbuf);
70-#ifndef G_PLATFORM_WIN32
71+#ifndef G_OS_WIN32
72 static gchar* find_parent_dir_fullname (gchar* dirname);
73 #endif
74 static CompletionDir* attach_dir (CompletionDirSent* sent,
75@@ -419,7 +419,7 @@ static void gtk_file_selection_rename_fi
76
77 static void free_selected_names (GPtrArray *names);
78
79-#ifndef G_PLATFORM_WIN32
80+#ifndef G_OS_WIN32
81
82 #define compare_utf8_filenames(a, b) strcmp(a, b)
83 #define compare_sys_filenames(a, b) strcmp(a, b)
84@@ -467,7 +467,7 @@ compare_sys_filenames (const gchar *a,
85 /* Saves errno when something cmpl does fails. */
86 static gint cmpl_errno;
87
88-#ifdef G_WITH_CYGWIN
89+#if 0
90 /*
91 * Take the path currently in the file selection
92 * entry field and translate as necessary from
93@@ -1157,9 +1157,6 @@ gtk_file_selection_get_filename (GtkFile
94
95 g_return_val_if_fail (GTK_IS_FILE_SELECTION (filesel), nothing);
96
97-#ifdef G_WITH_CYGWIN
98- translate_win32_path (filesel);
99-#endif
100 text = gtk_entry_get_text (GTK_ENTRY (filesel->selection_entry));
101 if (text)
102 {
103@@ -1514,10 +1511,6 @@ gtk_file_selection_delete_file (GtkWidge
104 if (fs->fileop_dialog)
105 return;
106
107-#ifdef G_WITH_CYGWIN
108- translate_win32_path (fs);
109-#endif
110-
111 filename = gtk_entry_get_text (GTK_ENTRY (fs->selection_entry));
112 if (strlen (filename) < 1)
113 return;
114@@ -1767,9 +1760,6 @@ gtk_file_selection_key_press (GtkWidget
115 (event->state & gtk_accelerator_get_default_mod_mask ()) == 0)
116 {
117 fs = GTK_FILE_SELECTION (user_data);
118-#ifdef G_WITH_CYGWIN
119- translate_win32_path (fs);
120-#endif
121 text = g_strdup (gtk_entry_get_text (GTK_ENTRY (fs->selection_entry)));
122
123 gtk_file_selection_populate (fs, text, TRUE, TRUE);
124@@ -1892,7 +1882,7 @@ static gchar *
125 get_real_filename (gchar *filename,
126 gboolean free_old)
127 {
128-#ifdef G_WITH_CYGWIN
129+#if 0
130 /* Check to see if the selection was a drive selector */
131 if (isalpha (filename[0]) && (filename[1] == ':'))
132 {
133@@ -1956,7 +1946,7 @@ gtk_file_selection_dir_activate (GtkTree
134 g_free (filename);
135 }
136
137-#ifdef G_PLATFORM_WIN32
138+#ifdef G_OS_WIN32
139
140 static void
141 win32_gtk_add_drives_to_dir_list (GtkListStore *model)
142@@ -2074,7 +2064,7 @@ gtk_file_selection_populate (GtkFileSele
143 poss = cmpl_next_completion (cmpl_state);
144 }
145
146-#ifdef G_PLATFORM_WIN32
147+#ifdef G_OS_WIN32
148 /* For Windows, add drives as potential selections */
149 win32_gtk_add_drives_to_dir_list (dir_model);
150 #endif
151@@ -3000,7 +2990,7 @@ open_new_dir (gchar *dir_name,
152 gchar *sys_dir_name;
153
154 sent = g_new (CompletionDirSent, 1);
155-#ifndef G_PLATFORM_WIN32
156+#ifndef G_OS_WIN32
157 sent->mtime = sbuf->st_mtime;
158 sent->inode = sbuf->st_ino;
159 sent->device = sbuf->st_dev;
160@@ -3098,7 +3088,7 @@ open_new_dir (gchar *dir_name,
161 return sent;
162 }
163
164-#ifndef G_PLATFORM_WIN32
165+#ifndef G_OS_WIN32
166
167 static gboolean
168 check_dir (gchar *dir_name,
169@@ -3171,14 +3161,14 @@ static CompletionDir*
170 open_dir (gchar *dir_name,
171 CompletionState *cmpl_state)
172 {
173-#ifndef G_PLATFORM_WIN32
174+#ifndef G_OS_WIN32
175 struct stat sbuf;
176 gboolean stat_subdirs;
177 GList* cdsl;
178 #endif
179 CompletionDirSent *sent;
180
181-#ifndef G_PLATFORM_WIN32
182+#ifndef G_OS_WIN32
183 if (!check_dir (dir_name, &sbuf, &stat_subdirs))
184 return NULL;
185
186@@ -3343,7 +3333,7 @@ correct_parent (CompletionDir *cmpl_dir,
187 struct stat parbuf;
188 gchar *last_slash;
189 gchar *first_slash;
190-#ifndef G_PLATFORM_WIN32
191+#ifndef G_OS_WIN32
192 gchar *new_name;
193 #endif
194 gchar *sys_filename;
195@@ -3385,7 +3375,7 @@ correct_parent (CompletionDir *cmpl_dir,
196 }
197 g_free (sys_filename);
198
199-#ifndef G_PLATFORM_WIN32 /* No inode numbers on Win32 */
200+#ifndef G_OS_WIN32 /* No inode numbers on Win32 */
201 if (parbuf.st_ino == sbuf->st_ino && parbuf.st_dev == sbuf->st_dev)
202 /* it wasn't a link */
203 return TRUE;
204@@ -3410,7 +3400,7 @@ correct_parent (CompletionDir *cmpl_dir,
205 return TRUE;
206 }
207
208-#ifndef G_PLATFORM_WIN32
209+#ifndef G_OS_WIN32
210
211 static gchar*
212 find_parent_dir_fullname (gchar* dirname)
213@@ -3521,7 +3511,7 @@ attempt_homedir_completion (gchar
214
215 #endif
216
217-#ifdef G_PLATFORM_WIN32
218+#ifdef G_OS_WIN32
219 /* FIXME: determine whether we should casefold all Unicode letters
220 * here, too (and in in first_diff_index() walk through the strings with
221 * g_utf8_next_char()), or if this folding isn't actually needed at
This page took 0.037775 seconds and 5 git commands to generate.