Changew index to filter_index to fix compilation error.

2003-10-28  Padraig O'Briain  <padraig.obriain@sun.com>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index 7b7d1e49b35ca7ea8e598f9c5095b943e43c6059..7a97140c2155a3fa84eb11d623d790053bd945fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-28  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * 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  <yosh@gimp.org>
 
        * gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7b7d1e49b35ca7ea8e598f9c5095b943e43c6059..7a97140c2155a3fa84eb11d623d790053bd945fc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2003-10-28  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * 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  <yosh@gimp.org>
 
        * gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7b7d1e49b35ca7ea8e598f9c5095b943e43c6059..7a97140c2155a3fa84eb11d623d790053bd945fc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2003-10-28  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * 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  <yosh@gimp.org>
 
        * gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7b7d1e49b35ca7ea8e598f9c5095b943e43c6059..7a97140c2155a3fa84eb11d623d790053bd945fc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2003-10-28  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * 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  <yosh@gimp.org>
 
        * gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7b7d1e49b35ca7ea8e598f9c5095b943e43c6059..7a97140c2155a3fa84eb11d623d790053bd945fc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2003-10-28  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * 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  <yosh@gimp.org>
 
        * gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index ff6f75608e80d3e6d27f97b9ae2e8b4452973bc9..efb6e9e55f6b3a851b954f24fb0e93ec188909fb 100644 (file)
--- 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 ee962b2599f58dead8edc1a95308724e99215150..288b8cbef7905b38b124b32f360311c600c3d6bf 100644 (file)
--- 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__ */