From dbd3b079ff446f8d3fac3ed4561b798816892f83 Mon Sep 17 00:00:00 2001 From: Padraig O'Briain Date: Tue, 28 Oct 2003 14:13:01 +0000 Subject: [PATCH] Changew index to filter_index to fix compilation error. 2003-10-28 Padraig O'Briain * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_remove_filter): Changew index to filter_index to fix compilation error. * gtk/gtkfilesystem.h: Correct definition of gtk_file_path_get_string. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkfilechooserdefault.c | 2 +- gtk/gtkfilesystem.h | 2 +- 7 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b7d1e49b3..7a97140c21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-10-28 Padraig O'Briain + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_remove_filter): + Changew index to filter_index to fix compilation error. + + * gtk/gtkfilesystem.h: Correct definition of gtk_file_path_get_string. + Mon Oct 27 15:47:58 2003 Manish Singh * gdk/x11/gdkscreen-x11.c: #include if diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7b7d1e49b3..7a97140c21 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2003-10-28 Padraig O'Briain + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_remove_filter): + Changew index to filter_index to fix compilation error. + + * gtk/gtkfilesystem.h: Correct definition of gtk_file_path_get_string. + Mon Oct 27 15:47:58 2003 Manish Singh * gdk/x11/gdkscreen-x11.c: #include if diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7b7d1e49b3..7a97140c21 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2003-10-28 Padraig O'Briain + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_remove_filter): + Changew index to filter_index to fix compilation error. + + * gtk/gtkfilesystem.h: Correct definition of gtk_file_path_get_string. + Mon Oct 27 15:47:58 2003 Manish Singh * gdk/x11/gdkscreen-x11.c: #include if diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7b7d1e49b3..7a97140c21 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2003-10-28 Padraig O'Briain + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_remove_filter): + Changew index to filter_index to fix compilation error. + + * gtk/gtkfilesystem.h: Correct definition of gtk_file_path_get_string. + Mon Oct 27 15:47:58 2003 Manish Singh * gdk/x11/gdkscreen-x11.c: #include if diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7b7d1e49b3..7a97140c21 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2003-10-28 Padraig O'Briain + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_remove_filter): + Changew index to filter_index to fix compilation error. + + * gtk/gtkfilesystem.h: Correct definition of gtk_file_path_get_string. + Mon Oct 27 15:47:58 2003 Manish Singh * gdk/x11/gdkscreen-x11.c: #include if diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index ff6f75608e..efb6e9e55f 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -1685,7 +1685,7 @@ gtk_file_chooser_default_remove_filter (GtkFileChooser *chooser, filter_index = g_slist_index (impl->filters, filter); - if (index < 0) + if (filter_index < 0) { g_warning ("gtk_file_chooser_remove_filter() called on filter not in list\n"); return; diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h index ee962b2599..288b8cbef7 100644 --- a/gtk/gtkfilesystem.h +++ b/gtk/gtkfilesystem.h @@ -295,7 +295,7 @@ GtkFileInfo *gtk_file_folder_get_info (GtkFileFolder *folder, #else /* __GNUC__ */ #define gtk_file_path_new_dup(str) ((GtkFilePath *)g_strdup(str)) #define gtk_file_path_new_steal(str) ((GtkFilePath *)(str)) -#define gtk_file_path_get_string(path) ((const gchar *)(str)) +#define gtk_file_path_get_string(str) ((const gchar *)(str)) #define gtk_file_path_free(path) g_free (path) #endif/* __GNUC__ */