From 4f771b6d26c0877933badc401fdb77b8f3a6f4ee Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Wed, 6 Oct 1999 19:47:24 +0000 Subject: [PATCH] s/G_HAVE_CYGWIN/G_WITH_CYGWIN/ -Yosh --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/fnmatch.c | 2 +- gtk/gtkfilesel.c | 34 +++++++++++++++++----------------- 9 files changed, 53 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index f277c07f75..bd6f96e089 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Oct 6 12:46:17 PDT 1999 Manish Singh + + * gtk/fnmatch.c + * gtk/gtkfilesel.c: s/G_HAVE_CYGWIN/G_WITH_CYGWIN/ + 1999-10-05 Jesus Bravo Alvarez * configure.in (ALL_LINGUAS): Added Galician (gl) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f277c07f75..bd6f96e089 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Wed Oct 6 12:46:17 PDT 1999 Manish Singh + + * gtk/fnmatch.c + * gtk/gtkfilesel.c: s/G_HAVE_CYGWIN/G_WITH_CYGWIN/ + 1999-10-05 Jesus Bravo Alvarez * configure.in (ALL_LINGUAS): Added Galician (gl) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f277c07f75..bd6f96e089 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Oct 6 12:46:17 PDT 1999 Manish Singh + + * gtk/fnmatch.c + * gtk/gtkfilesel.c: s/G_HAVE_CYGWIN/G_WITH_CYGWIN/ + 1999-10-05 Jesus Bravo Alvarez * configure.in (ALL_LINGUAS): Added Galician (gl) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f277c07f75..bd6f96e089 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Oct 6 12:46:17 PDT 1999 Manish Singh + + * gtk/fnmatch.c + * gtk/gtkfilesel.c: s/G_HAVE_CYGWIN/G_WITH_CYGWIN/ + 1999-10-05 Jesus Bravo Alvarez * configure.in (ALL_LINGUAS): Added Galician (gl) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f277c07f75..bd6f96e089 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Oct 6 12:46:17 PDT 1999 Manish Singh + + * gtk/fnmatch.c + * gtk/gtkfilesel.c: s/G_HAVE_CYGWIN/G_WITH_CYGWIN/ + 1999-10-05 Jesus Bravo Alvarez * configure.in (ALL_LINGUAS): Added Galician (gl) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f277c07f75..bd6f96e089 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Oct 6 12:46:17 PDT 1999 Manish Singh + + * gtk/fnmatch.c + * gtk/gtkfilesel.c: s/G_HAVE_CYGWIN/G_WITH_CYGWIN/ + 1999-10-05 Jesus Bravo Alvarez * configure.in (ALL_LINGUAS): Added Galician (gl) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f277c07f75..bd6f96e089 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Oct 6 12:46:17 PDT 1999 Manish Singh + + * gtk/fnmatch.c + * gtk/gtkfilesel.c: s/G_HAVE_CYGWIN/G_WITH_CYGWIN/ + 1999-10-05 Jesus Bravo Alvarez * configure.in (ALL_LINGUAS): Added Galician (gl) diff --git a/gtk/fnmatch.c b/gtk/fnmatch.c index 614c014e79..5f48470a68 100644 --- a/gtk/fnmatch.c +++ b/gtk/fnmatch.c @@ -67,7 +67,7 @@ fnmatch (pattern, string, flags) register char c; /* Note that this evalutes C many times. */ -#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN) +#if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN) #define FOLD(c) ((flags & FNM_CASEFOLD) && isupper (c) ? tolower (c) : (c)) #else #define FOLD(c) (tolower (c)) diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 6987ea1388..ccc674ece8 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -71,7 +71,7 @@ #include "gtkdialog.h" #include "gtkintl.h" -#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN) +#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN) #define STRICT #include @@ -85,7 +85,7 @@ #endif /* G_OS_WIN32 */ -#endif /* G_OS_WIN32 || G_HAVE_CYGWIN */ +#endif /* G_OS_WIN32 || G_WITH_CYGWIN */ #define DIR_LIST_WIDTH 180 #define DIR_LIST_HEIGHT 180 @@ -284,7 +284,7 @@ static gchar* cmpl_completion_fullname (gchar*, CompletionState* cm static CompletionDir* open_ref_dir (gchar* text_to_complete, gchar** remaining_text, CompletionState* cmpl_state); -#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN) +#if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN) static gboolean check_dir (gchar *dir_name, struct stat *result, gboolean *stat_subdirs); @@ -367,7 +367,7 @@ static GtkWindowClass *parent_class = NULL; /* Saves errno when something cmpl does fails. */ static gint cmpl_errno; -#ifdef G_HAVE_CYGWIN +#ifdef G_WITH_CYGWIN /* * Take the path currently in the file selection * entry field and translate as necessary from @@ -743,7 +743,7 @@ gtk_file_selection_get_filename (GtkFileSelection *filesel) g_return_val_if_fail (filesel != NULL, nothing); g_return_val_if_fail (GTK_IS_FILE_SELECTION (filesel), nothing); -#ifdef G_HAVE_CYGWIN +#ifdef G_WITH_CYGWIN translate_win32_path(filesel); #endif text = gtk_entry_get_text (GTK_ENTRY (filesel->selection_entry)); @@ -1011,7 +1011,7 @@ gtk_file_selection_delete_file (GtkWidget *widget, gpointer data) if (fs->fileop_dialog) return; -#ifdef G_HAVE_CYGWIN +#ifdef G_WITH_CYGWIN translate_win32_path(fs); #endif @@ -1200,7 +1200,7 @@ gtk_file_selection_key_press (GtkWidget *widget, if (event->keyval == GDK_Tab) { fs = GTK_FILE_SELECTION (user_data); -#ifdef G_HAVE_CYGWIN +#ifdef G_WITH_CYGWIN translate_win32_path(fs); #endif text = gtk_entry_get_text (GTK_ENTRY (fs->selection_entry)); @@ -1291,7 +1291,7 @@ gtk_file_selection_update_history_menu (GtkFileSelection *fs, /* another small hack to catch the full path */ if (i != dir_len) current_dir[i + 1] = '\0'; -#ifdef G_HAVE_CYGWIN +#ifdef G_WITH_CYGWIN if (!strcmp(current_dir, "//")) continue; #endif @@ -1343,7 +1343,7 @@ gtk_file_selection_file_button (GtkWidget *widget, gtk_clist_get_text (GTK_CLIST (fs->file_list), row, 0, &temp); filename = g_strdup (temp); -#ifdef G_HAVE_CYGWIN +#ifdef G_WITH_CYGWIN /* Check to see if the selection was a drive selector */ if (isalpha(filename[0]) && (filename[1] == ':')) { /* It is... map it to a CYGWIN32 drive */ @@ -1353,7 +1353,7 @@ gtk_file_selection_file_button (GtkWidget *widget, g_free(filename); filename = g_strdup(temp_filename); } -#endif /* G_HAVE_CYGWIN */ +#endif /* G_WITH_CYGWIN */ if (filename) { @@ -1414,7 +1414,7 @@ gtk_file_selection_dir_button (GtkWidget *widget, } } -#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN) +#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN) static void win32_gtk_add_drives_to_dir_list(GtkWidget *the_dir_list) @@ -1554,7 +1554,7 @@ gtk_file_selection_populate (GtkFileSelection *fs, poss = cmpl_next_completion (cmpl_state); } -#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN) +#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN) /* For Windows, add drives as potential selections */ win32_gtk_add_drives_to_dir_list (fs->dir_list); #endif @@ -1977,7 +1977,7 @@ open_ref_dir(gchar* text_to_complete, first_slash = strchr(text_to_complete, G_DIR_SEPARATOR); -#ifdef G_HAVE_CYGWIN +#ifdef G_WITH_CYGWIN if (text_to_complete[0] == '/' && text_to_complete[1] == '/') { char root_dir[5]; @@ -2230,7 +2230,7 @@ open_new_dir(gchar* dir_name, struct stat* sbuf, gboolean stat_subdirs) return sent; } -#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN) +#if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN) static gboolean check_dir(gchar *dir_name, struct stat *result, gboolean *stat_subdirs) @@ -2296,7 +2296,7 @@ open_dir(gchar* dir_name, CompletionState* cmpl_state) CompletionDirSent *sent; GList* cdsl; -#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN) +#if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN) if (!check_dir (dir_name, &sbuf, &stat_subdirs)) return NULL; @@ -2586,7 +2586,7 @@ attempt_homedir_completion(gchar* text_to_complete, #endif -#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN) +#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN) #define FOLD(c) (tolower(c)) #else #define FOLD(c) (c) @@ -2960,7 +2960,7 @@ compare_user_dir(const void* a, const void* b) static gint compare_cmpl_dir(const void* a, const void* b) { -#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN) +#if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN) return strcmp((((CompletionDirEntry*)a))->entry_name, (((CompletionDirEntry*)b))->entry_name); #else