summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--ChangeLog.pre-2-109
-rw-r--r--ChangeLog.pre-2-69
-rw-r--r--ChangeLog.pre-2-89
-rw-r--r--gtk/gtk.symbols9
-rw-r--r--gtk/gtkfilechooserdefault.c8
-rw-r--r--gtk/gtkfilesystem.c10
-rw-r--r--gtk/gtkimmodule.c4
-rw-r--r--gtk/gtkinternals.h4
9 files changed, 47 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index cb746a7353..335c4431f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-12 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkfilesystem.c: Underscore-prefix gtk_file_system_module_get_type().
+ * gtk/gtkfilechooserdefault.c: Underscore-prefix shortcuts_model_filter_get_type().
+
+ * gtk/gtkimmodule.c: Make gtk_im_module_get_type() static.
+ * gtk/gtk.symbols:
+ * gtk/gtkinternals.h: Remove the no longer exported get_type functions.
+
Thu Aug 12 01:35:46 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconview.c: Make the icon view accessible by
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cb746a7353..335c4431f1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2004-08-12 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkfilesystem.c: Underscore-prefix gtk_file_system_module_get_type().
+ * gtk/gtkfilechooserdefault.c: Underscore-prefix shortcuts_model_filter_get_type().
+
+ * gtk/gtkimmodule.c: Make gtk_im_module_get_type() static.
+ * gtk/gtk.symbols:
+ * gtk/gtkinternals.h: Remove the no longer exported get_type functions.
+
Thu Aug 12 01:35:46 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconview.c: Make the icon view accessible by
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cb746a7353..335c4431f1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2004-08-12 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkfilesystem.c: Underscore-prefix gtk_file_system_module_get_type().
+ * gtk/gtkfilechooserdefault.c: Underscore-prefix shortcuts_model_filter_get_type().
+
+ * gtk/gtkimmodule.c: Make gtk_im_module_get_type() static.
+ * gtk/gtk.symbols:
+ * gtk/gtkinternals.h: Remove the no longer exported get_type functions.
+
Thu Aug 12 01:35:46 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconview.c: Make the icon view accessible by
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cb746a7353..335c4431f1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2004-08-12 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkfilesystem.c: Underscore-prefix gtk_file_system_module_get_type().
+ * gtk/gtkfilechooserdefault.c: Underscore-prefix shortcuts_model_filter_get_type().
+
+ * gtk/gtkimmodule.c: Make gtk_im_module_get_type() static.
+ * gtk/gtk.symbols:
+ * gtk/gtkinternals.h: Remove the no longer exported get_type functions.
+
Thu Aug 12 01:35:46 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconview.c: Make the icon view accessible by
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 19b01fd0a8..026ad7cd8c 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -857,9 +857,6 @@ gtk_file_system_insert_bookmark
gtk_file_system_list_bookmarks
gtk_file_system_list_volumes
gtk_file_system_make_path
-#ifdef INCLUDE_INTERNAL_SYMBOLS
-gtk_file_system_module_get_type
-#endif
gtk_file_system_parse
gtk_file_system_path_is_local
gtk_file_system_path_to_filename
@@ -1128,9 +1125,6 @@ gtk_im_context_set_use_preedit
gtk_im_context_simple_add_table
gtk_im_context_simple_get_type
gtk_im_context_simple_new
-#ifdef INCLUDE_INTERNAL_SYMBOLS
-gtk_im_module_get_type
-#endif
gtk_im_multicontext_append_menuitems
gtk_im_multicontext_get_type
gtk_im_multicontext_new
@@ -2840,6 +2834,3 @@ gtk_window_unfullscreen
gtk_window_unmaximize
gtk_window_unstick
gtk_wrap_mode_get_type
-#ifdef INCLUDE_INTERNAL_SYMBOLS
-shortcuts_model_filter_get_type
-#endif
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 5768b12d35..9264cffeb5 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -417,13 +417,13 @@ typedef struct {
GtkTreeModelFilterClass parent_class;
} ShortcutsModelFilterClass;
-#define SHORTCUTS_MODEL_FILTER_TYPE (shortcuts_model_filter_get_type ())
+#define SHORTCUTS_MODEL_FILTER_TYPE (_shortcuts_model_filter_get_type ())
#define SHORTCUTS_MODEL_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHORTCUTS_MODEL_FILTER_TYPE, ShortcutsModelFilter))
static void shortcuts_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface);
G_DEFINE_TYPE_WITH_CODE (ShortcutsModelFilter,
- shortcuts_model_filter,
+ _shortcuts_model_filter,
GTK_TYPE_TREE_MODEL_FILTER,
G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
shortcuts_model_filter_drag_source_iface_init));
@@ -5712,12 +5712,12 @@ home_folder_handler (GtkFileChooserDefault *impl)
/* Drag and drop interfaces */
static void
-shortcuts_model_filter_class_init (ShortcutsModelFilterClass *class)
+_shortcuts_model_filter_class_init (ShortcutsModelFilterClass *class)
{
}
static void
-shortcuts_model_filter_init (ShortcutsModelFilter *model)
+_shortcuts_model_filter_init (ShortcutsModelFilter *model)
{
model->impl = NULL;
}
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index e364429dcd..92048563a7 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -1006,8 +1006,8 @@ struct _GtkFileSystemModuleClass
GTypeModuleClass parent_class;
};
-G_DEFINE_TYPE (GtkFileSystemModule, gtk_file_system_module, G_TYPE_TYPE_MODULE);
-#define GTK_TYPE_FILE_SYSTEM_MODULE (gtk_file_system_module_get_type ())
+G_DEFINE_TYPE (GtkFileSystemModule, _gtk_file_system_module, G_TYPE_TYPE_MODULE);
+#define GTK_TYPE_FILE_SYSTEM_MODULE (_gtk_file_system_module_get_type ())
#define GTK_FILE_SYSTEM_MODULE(module) (G_TYPE_CHECK_INSTANCE_CAST ((module), GTK_TYPE_FILE_SYSTEM_MODULE, GtkFileSystemModule))
@@ -1071,11 +1071,11 @@ gtk_file_system_module_finalize (GObject *object)
g_free (module->path);
- G_OBJECT_CLASS (gtk_file_system_module_parent_class)->finalize (object);
+ G_OBJECT_CLASS (_gtk_file_system_module_parent_class)->finalize (object);
}
static void
-gtk_file_system_module_class_init (GtkFileSystemModuleClass *class)
+_gtk_file_system_module_class_init (GtkFileSystemModuleClass *class)
{
GTypeModuleClass *module_class = G_TYPE_MODULE_CLASS (class);
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
@@ -1087,7 +1087,7 @@ gtk_file_system_module_class_init (GtkFileSystemModuleClass *class)
}
static void
-gtk_file_system_module_init (GtkFileSystemModule *fs_module)
+_gtk_file_system_module_init (GtkFileSystemModule *fs_module)
{
}
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index abe51381f4..4c250cfd00 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -77,7 +77,7 @@ struct _GtkIMModuleClass
GTypeModuleClass parent_class;
};
-GType gtk_im_module_get_type (void);
+static GType gtk_im_module_get_type (void);
static gint n_loaded_contexts = 0;
static GHashTable *contexts_hash = NULL;
@@ -163,7 +163,7 @@ gtk_im_module_class_init (GtkIMModuleClass *class)
gobject_class->finalize = gtk_im_module_finalize;
}
-GType
+static GType
gtk_im_module_get_type (void)
{
static GType im_module_type = 0;
diff --git a/gtk/gtkinternals.h b/gtk/gtkinternals.h
index 699ff8bad3..b3e1c2aeb0 100644
--- a/gtk/gtkinternals.h
+++ b/gtk/gtkinternals.h
@@ -33,10 +33,6 @@
G_BEGIN_DECLS
-GType gtk_im_module_get_type (void);
-GType gtk_file_system_module_get_type (void);
-GType shortcuts_model_filter_get_type (void);
-
G_END_DECLS
#endif /* __GTK_INTERNALS_H__ */