[POS-commit] r274 - libglade

[Johan Dahlin]

Author: jdahlin
Date: 2005-03-31 19:13:42 -0300 (Thu, 31 Mar 2005)
New Revision: 274

Modified:
   libglade/glade-build.h
   libglade/glade-xml.h
Log:
Clean up headers a little bit

Modified: libglade/glade-build.h
===================================================================
--- libglade/glade-build.h	2005-03-31 22:13:27 UTC (rev 273)
+++ libglade/glade-build.h	2005-03-31 22:13:42 UTC (rev 274)
@@ -60,22 +60,6 @@
 				const gchar *prop_name,
 				GladeApplyCustomPropFunc apply_prop);
 
-/* set the current toplevel object while building (use NULL to unset) */
-void       glade_xml_set_toplevel(GladeXML *xml, GtkWindow *window);
-
-/* make sure that xml->priv->accel_group is a valid AccelGroup */
-GtkAccelGroup *glade_xml_ensure_accel(GladeXML *xml);
-
-void glade_xml_handle_object_prop(GladeXML *self,
-				  GObject *object,
-				  const gchar *prop_name,
-				  const gchar *value_name);
-
-void glade_xml_set_packing_property (GladeXML   *self,
-				     GtkWidget  *parent,
-				     GtkWidget  *child,
-				     const char *name,   const char *value);
-
 /* this function is called to build the interface by GladeXML */
 GObject *glade_xml_build_object(GladeXML *self, GladeObjectInfo *info);
 
@@ -94,11 +78,6 @@
 				       GObject *object,
 				       GladeObjectInfo *info);
 
-gboolean glade_xml_set_value_from_string (GladeXML *xml,
-					  GParamSpec *pspec,
-					  const gchar *string,
-					  GValue *value);
-
 GObject *glade_standard_build_object(GladeXML *xml, GType object_type,
 				     GladeObjectInfo *info);
 
@@ -112,23 +91,45 @@
 guint glade_flags_from_string(GType type, const char *string);
 
 /* the module dynamic loading interface ... */
+typedef struct _GladeSignalData GladeSignalData;
+struct _GladeSignalData {
+    GObject *signal_object;
+    char *signal_name;
+    char *connect_object; /* or NULL if there is none */
+    gboolean signal_after;
+};
 
-/* increase this when there is a binary incompatible change in the
- * libglade module API */
-#define GLADE_MODULE_API_VERSION 1
-gchar *glade_module_check_version(gint version);
+typedef struct _GladeDeferredProperty GladeDeferredProperty;
+struct _GladeDeferredProperty {
+    const gchar *target_name;
 
-#define GLADE_MODULE_CHECK_INIT \
-G_MODULE_EXPORT const gchar *g_module_check_init(GModule *gmodule); \
-const gchar * \
-g_module_check_init(GModule *gmodule) \
-{ \
-  return glade_module_check_version(GLADE_MODULE_API_VERSION); \
-}
+    enum { DEFERRED_PROP, DEFERRED_REL } type;
+    union {
+	struct {
+	    GObject *object;
+	    const gchar *prop_name;
+	} prop;
+	struct {
+	    AtkRelationSet *relation_set;
+	    AtkRelationType relation_type;
+	} rel;
+    } d;
+};
 
-/* prototype for plugin init function (should be implemented by plugin) */
-G_MODULE_EXPORT void glade_module_register_objects(void);
+typedef enum {
+    GLADE_DEBUG_PARSER = 1 << 0,
+    GLADE_DEBUG_BUILD  = 1 << 1
+} GladeDebugFlag;
 
+extern guint _glade_debug_flags;
+#ifdef DEBUG
+#  define GLADE_NOTE(type, action)  G_STMT_START { \
+    if (_glade_debug_flags & GLADE_DEBUG_##type) \
+        { action; };                } G_STMT_END
+#else
+#  define GLADE_NOTE(type, action)
+#endif
+
 G_END_DECLS
 	
 #endif

Modified: libglade/glade-xml.h
===================================================================
--- libglade/glade-xml.h	2005-03-31 22:13:27 UTC (rev 273)
+++ libglade/glade-xml.h	2005-03-31 22:13:42 UTC (rev 274)
@@ -133,45 +133,27 @@
 void glade_xml_add_ui_merge_id    (GladeXML *xml, const gchar *name, int merge_id,
 				   GObject *ui_manager);
 
+/* set the current toplevel object while building (use NULL to unset) */
+void       glade_xml_set_toplevel(GladeXML *xml, GtkWindow *window);
 
-typedef struct _GladeSignalData GladeSignalData;
-struct _GladeSignalData {
-    GObject *signal_object;
-    char *signal_name;
-    char *connect_object; /* or NULL if there is none */
-    gboolean signal_after;
-};
+/* make sure that xml->priv->accel_group is a valid AccelGroup */
+GtkAccelGroup *glade_xml_ensure_accel(GladeXML *xml);
 
-typedef struct _GladeDeferredProperty GladeDeferredProperty;
-struct _GladeDeferredProperty {
-    const gchar *target_name;
+void glade_xml_handle_object_prop(GladeXML *self,
+				  GObject *object,
+				  const gchar *prop_name,
+				  const gchar *value_name);
 
-    enum { DEFERRED_PROP, DEFERRED_REL } type;
-    union {
-	struct {
-	    GObject *object;
-	    const gchar *prop_name;
-	} prop;
-	struct {
-	    AtkRelationSet *relation_set;
-	    AtkRelationType relation_type;
-	} rel;
-    } d;
-};
+void glade_xml_set_packing_property (GladeXML   *self,
+				     GtkWidget  *parent,
+				     GtkWidget  *child,
+				     const char *name,   const char *value);
 
-typedef enum {
-    GLADE_DEBUG_PARSER = 1 << 0,
-    GLADE_DEBUG_BUILD  = 1 << 1
-} GladeDebugFlag;
+gboolean glade_xml_set_value_from_string (GladeXML *xml,
+					  GParamSpec *pspec,
+					  const gchar *string,
+					  GValue *value);
 
-extern guint _glade_debug_flags;
-#ifdef DEBUG
-#  define GLADE_NOTE(type, action)  G_STMT_START { \
-    if (_glade_debug_flags & GLADE_DEBUG_##type) \
-        { action; };                } G_STMT_END
-#else
-#  define GLADE_NOTE(type, action)
-#endif
 
 G_END_DECLS