diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2004-09-18 20:13:05 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2004-09-18 20:13:05 +0000 |
| commit | 07f0458eab97a6589cf507d1c84da1e89f15f268 (patch) | |
| tree | 7a1694553247fc1932db9f0d8016de16c2c0f6e0 | |
| parent | 653f2bdf70987914e9254e711774e5f0c92c8a14 (diff) | |
| download | gtk+-07f0458eab97a6589cf507d1c84da1e89f15f268.tar.gz | |
Merged from 2.4:
2004-09-18 Federico Mena Quintero <federico@ximian.com>
Merged from 2.4:
* gtk/gtkfilesystem.h: Removed the GTK_FILE_PATH() and
GTK_IS_FILE_PATH() macros. They are not supposed to exist, as
GtkFilePath is not an object. And they never worked, anyway.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 8 | ||||
| -rw-r--r-- | gtk/gtkfilesystem.h | 2 |
5 files changed, 32 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2004-09-18 Federico Mena Quintero <federico@ximian.com> + + Merged from 2.4: + + * gtk/gtkfilesystem.h: Removed the GTK_FILE_PATH() and + GTK_IS_FILE_PATH() macros. They are not supposed to exist, as + GtkFilePath is not an object. And they never worked, anyway. + 2004-09-18 Marco Pesenti Gritti <marco@gnome.org> * gtk/gtkentry.c: (gtk_entry_completion_key_press): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fd23646e32..2cb148dd72 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2004-09-18 Federico Mena Quintero <federico@ximian.com> + + Merged from 2.4: + + * gtk/gtkfilesystem.h: Removed the GTK_FILE_PATH() and + GTK_IS_FILE_PATH() macros. They are not supposed to exist, as + GtkFilePath is not an object. And they never worked, anyway. + 2004-09-18 Marco Pesenti Gritti <marco@gnome.org> * gtk/gtkentry.c: (gtk_entry_completion_key_press): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fd23646e32..2cb148dd72 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2004-09-18 Federico Mena Quintero <federico@ximian.com> + + Merged from 2.4: + + * gtk/gtkfilesystem.h: Removed the GTK_FILE_PATH() and + GTK_IS_FILE_PATH() macros. They are not supposed to exist, as + GtkFilePath is not an object. And they never worked, anyway. + 2004-09-18 Marco Pesenti Gritti <marco@gnome.org> * gtk/gtkentry.c: (gtk_entry_completion_key_press): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fd23646e32..2cb148dd72 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2004-09-18 Federico Mena Quintero <federico@ximian.com> + + Merged from 2.4: + + * gtk/gtkfilesystem.h: Removed the GTK_FILE_PATH() and + GTK_IS_FILE_PATH() macros. They are not supposed to exist, as + GtkFilePath is not an object. And they never worked, anyway. + 2004-09-18 Marco Pesenti Gritti <marco@gnome.org> * gtk/gtkentry.c: (gtk_entry_completion_key_press): diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h index d7a570024f..cc5ada841e 100644 --- a/gtk/gtkfilesystem.h +++ b/gtk/gtkfilesystem.h @@ -326,8 +326,6 @@ gboolean gtk_file_folder_is_finished_loading (GtkFileFolder *folder); /* GtkFilePath */ #define GTK_TYPE_FILE_PATH (gtk_file_path_get_type ()) -#define GTK_FILE_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_PATH, GtkFilePath)) -#define GTK_IS_FILE_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_PATH)) GType gtk_file_path_get_type (void); #ifdef __GNUC__ |