GNOME.org
 

glade3 r1753 - in branches/builder: . gladeui

Author: tvb
Date: Sun Mar 30 23:04:05 2008
New Revision: 1753
URL: http://svn.gnome.org/viewvc/glade3?rev=1753&view=rev

Log:

	* gladeui/glade-parser.[ch]

	* lots of files: removed references to load/save,
	  disabled load/save - clearing the way for builder support.


M    ChangeLog
M    gladeui/glade-widget.c
M    gladeui/glade-widget.h
M    gladeui/glade-widget-adaptor.c
D    gladeui/glade-parser.c
M    gladeui/glade-xml-utils.c
D    gladeui/glade-parser.h
M    gladeui/glade-xml-utils.h
M    gladeui/glade-property.c
M    gladeui/glade-property.h
M    gladeui/glade-property-class.h
M    gladeui/glade-project.c
M    gladeui/glade-signal.c
M    gladeui/Makefile.am
M    gladeui/glade-signal.h


Removed:
   branches/builder/gladeui/glade-parser.c
   branches/builder/gladeui/glade-parser.h
Modified:
   branches/builder/ChangeLog
   branches/builder/gladeui/Makefile.am
   branches/builder/gladeui/glade-project.c
   branches/builder/gladeui/glade-property-class.h
   branches/builder/gladeui/glade-property.c
   branches/builder/gladeui/glade-property.h
   branches/builder/gladeui/glade-signal.c
   branches/builder/gladeui/glade-signal.h
   branches/builder/gladeui/glade-widget-adaptor.c
   branches/builder/gladeui/glade-widget.c
   branches/builder/gladeui/glade-widget.h
   branches/builder/gladeui/glade-xml-utils.c
   branches/builder/gladeui/glade-xml-utils.h

Modified: branches/builder/gladeui/Makefile.am
==============================================================================
--- branches/builder/gladeui/Makefile.am	(original)
+++ branches/builder/gladeui/Makefile.am	Sun Mar 30 23:04:05 2008
@@ -51,7 +51,6 @@
 	glade-id-allocator.h \
 	glade-marshallers.c \
 	glade-accumulators.c \
-	glade-parser.c \
 	glade-builtins.c \
 	glade-app.c \
 	glade-keysyms.c \
@@ -110,11 +109,10 @@
 	glade-fixed.h \
 	glade-base-editor.h \
 	glade-xml-utils.h \
-	glade-parser.h \
 	glade-signal.h \
 	glade-cursor.h \
 	glade-widget-action.h
-	
+
 
 if PLATFORM_WIN32
 libgladeui_1_la_LDFLAGS += -no-undefined

Modified: branches/builder/gladeui/glade-project.c
==============================================================================
--- branches/builder/gladeui/glade-project.c	(original)
+++ branches/builder/gladeui/glade-project.c	Sun Mar 30 23:04:05 2008
@@ -128,9 +128,9 @@
 
 static GladeIDAllocator  *unsaved_number_allocator = NULL;
 
-static gboolean glade_project_load_from_interface (GladeProject   *project,
-						   GladeInterface *interface,
-						   const gchar    *path);
+/* XXX static gboolean glade_project_load_from_interface (GladeProject   *project, */
+/* 						   GladeInterface *interface, */
+/* 						   const gchar    *path); */
 
 
 G_DEFINE_TYPE (GladeProject, glade_project, G_TYPE_OBJECT)
@@ -767,6 +767,8 @@
 gboolean
 glade_project_load_from_file (GladeProject *project, const gchar *path)
 {
+#if LOADING_WAS_IMPLEMENTED
+
 	GladeInterface *interface;
 	
 	g_return_val_if_fail (GLADE_IS_PROJECT (project), FALSE); 
@@ -795,6 +797,8 @@
 		
 	project->priv->mtime = glade_util_get_file_mtime (project->priv->path, NULL);
 
+#endif // LOADING_WAS_IMPLEMENTED
+
 	return TRUE;
 }
 
@@ -1517,6 +1521,8 @@
 	g_strfreev (lines);
 }
 
+#if LOADING_WAS_IMPLEMENTED
+
 /**
  * glade_project_write:
  * @project: a #GladeProject
@@ -1606,6 +1612,9 @@
 	return loadable;
 }
 
+#endif // LOADING_WAS_IMPLEMENTED
+
+
 static void 
 glade_project_fix_object_props (GladeProject *project)
 {
@@ -1645,6 +1654,8 @@
 	}
 }
 
+#if LOADING_WAS_IMPLEMENTED
+
 static gboolean
 glade_project_load_from_interface (GladeProject   *project,
 				   GladeInterface *interface,
@@ -1700,6 +1711,9 @@
 	return TRUE;	
 }
 
+#endif // LOADING_WAS_IMPLEMENTED
+
+
 /**
  * glade_project_load:
  * @path:
@@ -1774,6 +1788,8 @@
 gboolean
 glade_project_save (GladeProject *project, const gchar *path, GError **error)
 {
+#if LOADING_WAS_IMPLEMENTED
+
 	GladeInterface *interface;
 	gboolean        ret;
 	gchar          *canonical_path;
@@ -1830,6 +1846,9 @@
 	g_free (canonical_path);
 
 	return ret;
+#endif // LOADING_WAS_IMPLEMENTED
+
+	return TRUE;
 }
 
 

Modified: branches/builder/gladeui/glade-property-class.h
==============================================================================
--- branches/builder/gladeui/glade-property-class.h	(original)
+++ branches/builder/gladeui/glade-property-class.h	Sun Mar 30 23:04:05 2008
@@ -19,6 +19,7 @@
 #define GPC_PROPERTY_NAMELEN 512  /* Enough space for a property name I think */
 
 typedef struct _GladePropertyClass GladePropertyClass;
+typedef struct _GladeAccelInfo     GladeAccelInfo;
 
 /**
  * GPCType:
@@ -36,6 +37,12 @@
 	GPC_ACCEL_PROPERTY
 } GPCType;
 
+struct _GladeAccelInfo {
+    guint key;
+    GdkModifierType modifiers;
+    gchar *signal;
+};
+
 struct _GladePropertyClass
 {
 	GPCType type; /* A symbolic type used to load/save properties differently

Modified: branches/builder/gladeui/glade-property.c
==============================================================================
--- branches/builder/gladeui/glade-property.c	(original)
+++ branches/builder/gladeui/glade-property.c	Sun Mar 30 23:04:05 2008
@@ -353,6 +353,8 @@
 		g_object_get_property (object, property->klass->id, property->value);
 }
 
+#if LOADING_WAS_IMPLEMENTED
+
 static gboolean
 glade_property_write_impl (GladeProperty  *property, 
 			   GladeInterface *interface,
@@ -469,6 +471,9 @@
 	return TRUE;
 }
 
+#endif //  LOADING_WAS_IMPLEMENTED
+
+
 static G_CONST_RETURN gchar *
 glade_property_get_tooltip_impl (GladeProperty *property)
 {
@@ -593,7 +598,7 @@
 	prop_class->get_default           = glade_property_get_default_impl;
 	prop_class->sync                  = glade_property_sync_impl;
 	prop_class->load                  = glade_property_load_impl;
-	prop_class->write                 = glade_property_write_impl;
+/* XXX	prop_class->write                 = glade_property_write_impl; */
 	prop_class->get_tooltip           = glade_property_get_tooltip_impl;
 	prop_class->value_changed         = NULL;
 	prop_class->tooltip_changed       = NULL;
@@ -689,6 +694,8 @@
 /*******************************************************************************
                         GladeInterface Parsing code
  *******************************************************************************/
+#if LOADING_WAS_IMPLEMENTED
+
 static GValue *
 glade_property_read_packing (GladeProperty      *property, 
 			     GladePropertyClass *pclass,
@@ -987,6 +994,7 @@
 	return gvalue;
 }
 
+#endif // LOADING_WAS_IMPLEMENTED
 
 /*******************************************************************************
                                      API
@@ -1318,6 +1326,9 @@
 	GLADE_PROPERTY_GET_KLASS (property)->load (property);
 }
 
+
+#if LOADING_WAS_IMPLEMENTED
+
 /**
  * glade_property_read:
  * @property: a #GladeProperty or #NULL
@@ -1400,6 +1411,9 @@
 	return GLADE_PROPERTY_GET_KLASS (property)->write (property, interface, props);
 }
 
+#endif // LOADING_WAS_IMPLEMENTED
+
+
 /**
  * glade_property_add_object:
  * @property: a #GladeProperty

Modified: branches/builder/gladeui/glade-property.h
==============================================================================
--- branches/builder/gladeui/glade-property.h	(original)
+++ branches/builder/gladeui/glade-property.h	Sun Mar 30 23:04:05 2008
@@ -78,7 +78,7 @@
 	void                    (* get_default)           (GladeProperty *, GValue *);
 	void                    (* sync)                  (GladeProperty *);
 	void                    (* load)                  (GladeProperty *);
-	gboolean                (* write)                 (GladeProperty *, GladeInterface *, GArray *);
+/* XXX	gboolean                (* write)                 (GladeProperty *, GladeInterface *, GArray *); */
 	G_CONST_RETURN gchar *  (* get_tooltip)           (GladeProperty *);
 
 	/* Signals */
@@ -147,9 +147,9 @@
 							      gpointer            info,
 							      gboolean            free_value);
 
-gboolean                glade_property_write                 (GladeProperty      *property, 
-							      GladeInterface     *interface, 
-							      GArray             *props);
+/* XXX gboolean                glade_property_write                 (GladeProperty      *property,  */
+/* 							      GladeInterface     *interface,  */
+/* 							      GArray             *props); */
 
 G_CONST_RETURN gchar   *glade_property_get_tooltip           (GladeProperty      *property);
 

Modified: branches/builder/gladeui/glade-signal.c
==============================================================================
--- branches/builder/gladeui/glade-signal.c	(original)
+++ branches/builder/gladeui/glade-signal.c	Sun Mar 30 23:04:05 2008
@@ -118,8 +118,11 @@
 				 signal->userdata,
 				 signal->lookup,
 				 signal->after);
+
 }
 
+#if LOADING_WAS_IMPLEMENTED
+
 /**
  * glade_signal_write:
  * @info:
@@ -164,3 +167,4 @@
 
 	return signal;
 }
+#endif // LOADING_WAS_IMPLEMENTED

Modified: branches/builder/gladeui/glade-signal.h
==============================================================================
--- branches/builder/gladeui/glade-signal.h	(original)
+++ branches/builder/gladeui/glade-signal.h	Sun Mar 30 23:04:05 2008
@@ -2,7 +2,7 @@
 #ifndef __GLADE_SIGNAL_H__
 #define __GLADE_SIGNAL_H__
 
-#include "glade-parser.h"
+#include <glib.h>
 
 G_BEGIN_DECLS
 
@@ -34,10 +34,10 @@
 
 gboolean     glade_signal_equal (GladeSignal *sig1, GladeSignal *sig2);
 
-gboolean     glade_signal_write (GladeSignalInfo *info, GladeSignal *signal,
-				 GladeInterface *interface);
+/* XXX gboolean     glade_signal_write (GladeSignalInfo *info, GladeSignal *signal, */
+/* 				 GladeInterface *interface); */
 
-GladeSignal *glade_signal_new_from_signal_info (GladeSignalInfo *info);
+/* GladeSignal *glade_signal_new_from_signal_info (GladeSignalInfo *info); */
 
 
 G_END_DECLS

Modified: branches/builder/gladeui/glade-widget-adaptor.c
==============================================================================
--- branches/builder/gladeui/glade-widget-adaptor.c	(original)
+++ branches/builder/gladeui/glade-widget-adaptor.c	Sun Mar 30 23:04:05 2008
@@ -73,6 +73,13 @@
 	GList *packing_defaults;
 };
 
+
+struct _GladePackingDefault {
+    gchar  *id;
+    gchar  *value;
+};
+
+
 enum {
 	PROP_0,
 	PROP_NAME,
@@ -86,7 +93,8 @@
 	PROP_CURSOR
 };
 
-typedef struct _GladeChildPacking GladeChildPacking;
+typedef struct _GladeChildPacking    GladeChildPacking;
+typedef struct _GladePackingDefault  GladePackingDefault;
 
 static GObjectClass *parent_class = NULL;
 static GHashTable   *adaptor_hash = NULL;

Modified: branches/builder/gladeui/glade-widget.c
==============================================================================
--- branches/builder/gladeui/glade-widget.c	(original)
+++ branches/builder/gladeui/glade-widget.c	Sun Mar 30 23:04:05 2008
@@ -62,16 +62,16 @@
 							GladeWidgetAdaptor    *adaptor);
 static void         glade_widget_set_properties        (GladeWidget           *widget,
 							GList                 *properties);
-static GParameter  *glade_widget_info_params           (GladeWidgetAdaptor    *adaptor,
-							GladeWidgetInfo       *info,
-							gboolean               construct,
-							guint                 *n_params);
-static void         glade_widget_fill_from_widget_info (GladeWidgetInfo       *info,
-							GladeWidget           *widget,
-							gboolean               apply_props);
-static GladeWidget *glade_widget_new_from_widget_info  (GladeWidgetInfo       *info,
-							GladeProject          *project,
-							GladeWidget           *parent);
+/* XXX static GParameter  *glade_widget_info_params           (GladeWidgetAdaptor    *adaptor, */
+/* 							GladeWidgetInfo       *info, */
+/* 							gboolean               construct, */
+/* 							guint                 *n_params); */
+/* static void         glade_widget_fill_from_widget_info (GladeWidgetInfo       *info, */
+/* 							GladeWidget           *widget, */
+/* 							gboolean               apply_props); */
+/* static GladeWidget *glade_widget_new_from_widget_info  (GladeWidgetInfo       *info, */
+/* 							GladeProject          *project, */
+/* 							GladeWidget           *parent); */
 
 static gboolean     glade_window_is_embedded           (GtkWindow *window);
 static gboolean     glade_widget_embed                 (GladeWidget *widget);
@@ -519,7 +519,7 @@
 }
 
 static GObject *
-glade_widget_build_object (GladeWidgetAdaptor *adaptor, GladeWidget *widget, GladeWidgetInfo *info)
+glade_widget_build_object (GladeWidgetAdaptor *adaptor, GladeWidget *widget, void /* GladeWidgetInfo */ *info)
 {
 	GParameter          *params;
 	GObject             *object;
@@ -527,8 +527,8 @@
 
 	if (widget)
 		params = glade_widget_template_params (widget, TRUE, &n_params);
-	else if (info)
-		params = glade_widget_info_params (adaptor, info, TRUE, &n_params);
+/* 	else if (info) */
+/* 		params = glade_widget_info_params (adaptor, info, TRUE, &n_params); */
 	else
 		params = glade_widget_adaptor_default_params (adaptor, TRUE, &n_params);
 
@@ -540,8 +540,8 @@
 
 	if (widget)
 		params = glade_widget_template_params (widget, FALSE, &n_params);
-	else if (info)
-		params = glade_widget_info_params (adaptor, info, FALSE, &n_params);
+/* 	else if (info) */
+/* 		params = glade_widget_info_params (adaptor, info, FALSE, &n_params); */
 	else
 		params = glade_widget_adaptor_default_params (adaptor, FALSE, &n_params);
 
@@ -715,7 +715,7 @@
 	{
 		object = glade_widget_build_object(gwidget->adaptor, 
 						   gwidget->construct_template, 
-						   gwidget->construct_info);
+						   NULL/* gwidget->construct_info */);
 		glade_widget_set_object (gwidget, object);
 	}
 
@@ -863,9 +863,9 @@
 	case PROP_TEMPLATE:
 		widget->construct_template = g_value_get_object (value);
 		break;
-	case PROP_INFO:
-		widget->construct_info = g_value_get_pointer (value);
-		break;
+/* XXX	case PROP_INFO: */
+/* 		widget->construct_info = g_value_get_pointer (value); */
+/* 		break; */
 	case PROP_REASON:
 		widget->construct_reason = g_value_get_int (value);
 		break;
@@ -1076,11 +1076,11 @@
 				      GLADE_TYPE_WIDGET,
 				      G_PARAM_CONSTRUCT_ONLY|G_PARAM_WRITABLE));
 
-	g_object_class_install_property
-		(object_class, 	PROP_INFO,
-		 g_param_spec_pointer ("info", _("Info"),
-				       _("A GladeWidgetInfo struct to base a new widget on"),
-				       G_PARAM_CONSTRUCT_ONLY|G_PARAM_WRITABLE));
+/* XXX	g_object_class_install_property */
+/* 		(object_class, 	PROP_INFO, */
+/* 		 g_param_spec_pointer ("info", _("Info"), */
+/* 				       _("A GladeWidgetInfo struct to base a new widget on"), */
+/* 				       G_PARAM_CONSTRUCT_ONLY|G_PARAM_WRITABLE)); */
 
 	g_object_class_install_property
 		(object_class, 	PROP_REASON,
@@ -1788,6 +1788,7 @@
 /*******************************************************************************
                            GladeInterface Parsing code
  *******************************************************************************/
+#if LOADING_WAS_IMPLEMENTED
 static gint
 glade_widget_set_child_type_from_child_info (GladeChildInfo     *child_info,
 					     GladeWidgetAdaptor *parent_adaptor,
@@ -2079,7 +2080,7 @@
 	*n_params = params->len;
 	return (GParameter *)g_array_free (params, FALSE);
 }
-
+#endif // obsolete loading code
 /*******************************************************************************
                                      API
  *******************************************************************************/
@@ -2176,7 +2177,7 @@
 		if (layout && !GTK_WIDGET_REALIZED (layout))
 		{
 			/* XXX Dangerous !!! give her a little kick */
-			g_idle_add (glade_widget_show_idle, widget);
+			g_idle_add ((GSourceFunc)glade_widget_show_idle, widget);
 			return;
 		}
 		else if (!layout)
@@ -3609,6 +3610,8 @@
 }
 
 /* XML Serialization */
+#if LOADING_WAS_IMPLEMENTED
+
 static gboolean
 glade_widget_write_child (GArray *children, GladeWidget *parent, GObject *object, GladeInterface *interface);
 
@@ -3889,6 +3892,7 @@
 
 	return widget;
 }
+#endif // LOADING_WAS_IMPLEMENTED
 
 static gint glade_widget_su_stack = 0;
 

Modified: branches/builder/gladeui/glade-widget.h
==============================================================================
--- branches/builder/gladeui/glade-widget.h	(original)
+++ branches/builder/gladeui/glade-widget.h	Sun Mar 30 23:04:05 2008
@@ -97,7 +97,7 @@
 	
 	/* Construct parameters: */
 	GladeWidget       *construct_template;
-	GladeWidgetInfo   *construct_info;
+/* 	GladeWidgetInfo   *construct_info; */
 	GladeCreateReason  construct_reason;
 	gchar             *construct_internal;
 };
@@ -136,11 +136,11 @@
 void                    glade_widget_remove_child           (GladeWidget      *parent,
 							     GladeWidget      *child);
  
-GladeWidgetInfo        *glade_widget_write                  (GladeWidget      *widget,
-							     GladeInterface   *interface);
+/* XXX GladeWidgetInfo        *glade_widget_write                  (GladeWidget      *widget, */
+/* 							     GladeInterface   *interface); */
  
-GladeWidget            *glade_widget_read                   (GladeProject     *project,
-							     GladeWidgetInfo  *info);
+/* GladeWidget            *glade_widget_read                   (GladeProject     *project, */
+/* 							     GladeWidgetInfo  *info); */
  
 void                    glade_widget_replace                (GladeWidget      *parent,
 							     GObject          *old_object,

Modified: branches/builder/gladeui/glade-xml-utils.c
==============================================================================
--- branches/builder/gladeui/glade-xml-utils.c	(original)
+++ branches/builder/gladeui/glade-xml-utils.c	Sun Mar 30 23:04:05 2008
@@ -744,6 +744,7 @@
 	return (GladeXmlNode *)node;
 }
 
+#if OBSOLETE_CODE_HERE
 gchar *
 glade_xml_alloc_string(GladeInterface *interface, const gchar *string)
 {
@@ -776,6 +777,7 @@
 
     return glade_xml_alloc_string(interface, norm_str->str);
 }
+#endif // OBSOLETE_CODE_HERE
 
 gboolean
 glade_xml_load_sym_from_node (GladeXmlNode     *node_in,

Modified: branches/builder/gladeui/glade-xml-utils.h
==============================================================================
--- branches/builder/gladeui/glade-xml-utils.h	(original)
+++ branches/builder/gladeui/glade-xml-utils.h	Sun Mar 30 23:04:05 2008
@@ -3,13 +3,18 @@
 #ifndef __GLADE_XML_UTILS_H__
 #define __GLADE_XML_UTILS_H__
 
-#include <gladeui/glade-parser.h>
+#include <glib.h>
+#include <gmodule.h>
+
 
 G_BEGIN_DECLS
 
 #define GLADE_XML_CONTEXT(c)    ((GladeXmlContext *)c)
 #define GLADE_XML_IS_CONTEXT(c) (c != NULL)
 
+#define CAST_BAD (gchar *)
+
+
 typedef struct _GladeXmlContext GladeXmlContext;
 typedef struct _GladeXmlNode    GladeXmlNode;
 typedef struct _GladeXmlDoc     GladeXmlDoc;
@@ -179,8 +184,8 @@
 						   const gchar *root_name);
 GladeXmlDoc *     glade_xml_context_get_doc (GladeXmlContext *context);
 
-gchar *		glade_xml_alloc_string   (GladeInterface *interface, const gchar *string);
-gchar *		glade_xml_alloc_propname (GladeInterface *interface, const gchar *string);
+/* XXX gchar *		glade_xml_alloc_string   (GladeInterface *interface, const gchar *string); */
+/* XXX gchar *		glade_xml_alloc_propname (GladeInterface *interface, const gchar *string); */
 
 gboolean        glade_xml_load_sym_from_node (GladeXmlNode     *node_in,
 					      GModule          *module,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]