Commit ecabb875 authored by Tristan Van Berkom's avatar Tristan Van Berkom

* Whole tree updated to remove all notion of project conversions and dual project formats,

	  no more libglade.
parent 159aa6f6
......@@ -17,6 +17,9 @@
* gladeui/glade-design-view.c: Made loading progress bar nicer looking and ellipsizing.
* Whole tree updated to remove all notion of project conversions and dual project formats,
no more libglade.
2010-12-28 Tristan Van Berkom <tristanvb@openismus.com>
* gladeui/Makefile.am, gladeui/glade.h, gladeui/glade-clipboard.c, gladeui/glade-app.[ch],
......
......@@ -40,9 +40,6 @@ struct _GladeCatalog
GList *targetable_versions; /* list of suitable version targets */
gboolean libglade_supported; /* whether this catalog supports libglade */
gboolean builder_supported; /* whether this catalog supports gtkbuilder */
gchar *library; /* Library name for backend support */
gchar *name; /* Symbolic catalog name */
......@@ -70,8 +67,6 @@ struct _GladeCatalog
gchar *init_function_name;/* Catalog's init function name */
GladeCatalogInitFunc init_function;
GladeProjectConvertFunc project_convert_function; /* pointer to module's project converter */
};
struct _GladeWidgetGroup
......@@ -143,8 +138,6 @@ catalog_allocate (void)
catalog->adaptors = NULL;
catalog->widget_groups = NULL;
catalog->libglade_supported = FALSE;
catalog->builder_supported = TRUE;
return catalog;
}
......@@ -156,7 +149,6 @@ catalog_open (const gchar *filename)
GladeXmlContext *context;
GladeXmlDoc *doc;
GladeXmlNode *root;
gchar *str;
/* get the context & root node of the catalog file */
context = glade_xml_context_new_from_path (filename,
......@@ -215,22 +207,6 @@ catalog_open (const gchar *filename)
if (!catalog->domain)
catalog->domain = g_strdup (catalog->library);
if ((str = glade_xml_get_property_string (root, GLADE_TAG_SUPPORTS)) != NULL)
{
gchar **split = g_strsplit (str, ",", 0);
gint i;
catalog->builder_supported = FALSE;
for (i = 0; split[i]; i++)
{
if (!strcmp (split[i], GLADE_TAG_LIBGLADE))
catalog->libglade_supported = TRUE;
else if (!strcmp (split[i], GLADE_TAG_GTKBUILDER))
catalog->builder_supported = TRUE;
}
}
/* catalog->icon_prefix defaults to catalog->name */
if (!catalog->icon_prefix)
......@@ -240,11 +216,6 @@ catalog_open (const gchar *filename)
catalog_get_function (catalog, catalog->init_function_name,
(gpointer) &catalog->init_function);
if ((str = glade_xml_get_value_string (root, GLADE_TAG_PROJECT_CONVERT_FUNCTION)) != NULL)
{
catalog_get_function (catalog, str, (gpointer) &catalog->project_convert_function);
}
return catalog;
}
......@@ -638,23 +609,6 @@ glade_catalog_get_icon_prefix (GladeCatalog *catalog)
return catalog->icon_prefix;
}
gboolean
glade_catalog_supports_libglade (GladeCatalog *catalog)
{
g_return_val_if_fail (GLADE_IS_CATALOG (catalog), FALSE);
return catalog->libglade_supported;
}
gboolean
glade_catalog_supports_gtkbuilder (GladeCatalog *catalog)
{
g_return_val_if_fail (GLADE_IS_CATALOG (catalog), FALSE);
return catalog->builder_supported;
}
guint16
glade_catalog_get_major_version (GladeCatalog *catalog)
{
......@@ -814,30 +768,3 @@ widget_group_destroy (GladeWidgetGroup *group)
g_slice_free (GladeWidgetGroup, group);
}
/**
* glade_catalog_convert_project:
* @catalog: A #GladeCatalog
* @project: The #GladeProject to convert
* @new_format: The format to convert @project to
*
* Do any data changes needed to the project for the new
* format in an undoable way.
*
* Returns: FALSE if any errors occurred during the conversion.
*/
gboolean
glade_catalog_convert_project (GladeCatalog *catalog,
GladeProject *project,
GladeProjectFormat new_format)
{
g_return_val_if_fail (GLADE_IS_CATALOG (catalog), FALSE);
g_return_val_if_fail (GLADE_IS_PROJECT (project), FALSE);
if (catalog->project_convert_function)
return catalog->project_convert_function (project, new_format);
return TRUE;
}
......@@ -47,22 +47,6 @@ typedef struct _GladeWidgetGroup GladeWidgetGroup;
*/
typedef void (*GladeCatalogInitFunc) (const gchar *name);
/**
* GladeProjectConvertFunc:
* @project: A #GladeProject
* @new_format: The format to convert @project to
*
* Generally format transperency is implemented at load/save time,
* but if some objects need to be setup differently, or some new
* objects created (like real GtkAdjustment objects for old inline
* property values) this is the place to do those things, be careful
* to use the GladeCommand api because conversions are undoable.
*
* Returns: FALSE if any errors occurred during the conversion.
*/
typedef gboolean (*GladeProjectConvertFunc) (GladeProject *project,
GladeProjectFormat new_format);
typedef struct {
gint major;
......@@ -99,11 +83,6 @@ gboolean glade_widget_group_get_expanded (GladeWidgetGroup *group);
const GList *glade_widget_group_get_adaptors (GladeWidgetGroup *group);
gboolean glade_catalog_convert_project (GladeCatalog *catalog,
GladeProject *project,
GladeProjectFormat new_format);
gboolean glade_catalog_supports_libglade (GladeCatalog *catalog);
gboolean glade_catalog_supports_gtkbuilder (GladeCatalog *catalog);
......
......@@ -484,19 +484,11 @@ glade_command_set_property_unifies (GladeCommand *this_cmd, GladeCommand *other_
for (list = cmd1->sdata; list; list = list->next)
{
GladeProject *project;
GladeProjectFormat fmt = GLADE_PROJECT_FORMAT_GTKBUILDER;
pdata1 = list->data;
if (pdata1->property->widget)
{
project = glade_widget_get_project (pdata1->property->widget);
fmt = glade_project_get_format (project);
}
if (glade_property_class_compare (pdata1->property->klass,
pdata1->old_value,
pdata1->new_value, fmt))
pdata1->new_value))
return FALSE;
}
return TRUE;
......@@ -585,8 +577,7 @@ glade_command_set_property_collapse (GladeCommand *this_cmd, GladeCommand *other
#define MAX_UNDO_MENU_ITEM_VALUE_LEN 10
static gchar *
glade_command_set_property_description (GladeCommandSetProperty *me,
GladeProjectFormat fmt)
glade_command_set_property_description (GladeCommandSetProperty *me)
{
GCSetPropData *sdata;
gchar *description = NULL;
......@@ -601,7 +592,7 @@ glade_command_set_property_description (GladeCommandSetProperty *me,
sdata = me->sdata->data;
value_name = glade_widget_adaptor_string_from_value
(GLADE_WIDGET_ADAPTOR (sdata->property->klass->handle),
sdata->property->klass, sdata->new_value, fmt);
sdata->property->klass, sdata->new_value);
g_assert (sdata->property->klass->name);
g_assert (sdata->property->widget->name);
......@@ -649,8 +640,7 @@ glade_command_set_properties_list (GladeProject *project, GList *props)
me->sdata = props;
cmd->description =
glade_command_set_property_description
(me, glade_project_get_format (project));
glade_command_set_property_description (me);
multiple = g_list_length (me->sdata) > 1;
......@@ -2134,11 +2124,9 @@ typedef struct {
GladeCommand parent;
GladeProperty *property;
gboolean translatable;
gboolean has_context;
gchar *context;
gchar *comment;
gboolean old_translatable;
gboolean old_has_context;
gchar *old_context;
gchar *old_comment;
} GladeCommandSetI18n;
......@@ -2156,7 +2144,6 @@ glade_command_set_i18n_execute(GladeCommand *cmd)
{
GladeCommandSetI18n *me = (GladeCommandSetI18n *)cmd;
gboolean temp_translatable;
gboolean temp_has_context;
gchar *temp_context;
gchar *temp_comment;
......@@ -2166,21 +2153,17 @@ glade_command_set_i18n_execute(GladeCommand *cmd)
/* set the new values in the property */
glade_property_i18n_set_translatable(me->property, me->translatable);
glade_property_i18n_set_has_context(me->property, me->has_context);
glade_property_i18n_set_context(me->property, me->context);
glade_property_i18n_set_comment(me->property, me->comment);
/* swap the current values with the old values to prepare for undo */
temp_translatable = me->translatable;
temp_has_context = me->has_context;
temp_context = me->context;
temp_comment = me->comment;
me->translatable = me->old_translatable;
me->has_context = me->old_has_context;
me->context = me->old_context;
me->comment = me->old_comment;
me->old_translatable = temp_translatable;
me->old_has_context = temp_has_context;
me->old_context = temp_context;
me->old_comment = temp_comment;
......@@ -2239,7 +2222,6 @@ glade_command_set_i18n_collapse (GladeCommand *this_cmd, GladeCommand *other_cmd
/* adjust this command to contain, as its old values, the other command's current values */
this->old_translatable = other->old_translatable;
this->old_has_context = other->old_has_context;
g_free (this->old_context);
g_free (this->old_comment);
this->old_context = other->old_context;
......@@ -2254,7 +2236,6 @@ glade_command_set_i18n_collapse (GladeCommand *this_cmd, GladeCommand *other_cmd
* glade_command_set_i18n:
* @property: a #GladeProperty
* @translatable: a #gboolean
* @has_context: a #gboolean
* @context: a #const gchar *
* @comment: a #const gchar *
*
......@@ -2263,7 +2244,6 @@ glade_command_set_i18n_collapse (GladeCommand *this_cmd, GladeCommand *other_cmd
void
glade_command_set_i18n (GladeProperty *property,
gboolean translatable,
gboolean has_context,
const gchar *context,
const gchar *comment)
{
......@@ -2273,22 +2253,17 @@ glade_command_set_i18n (GladeProperty *property,
/* check that something changed before continuing with the command */
if (translatable == property->i18n_translatable &&
has_context == property->i18n_has_context &&
/* XXX add context string shit herex */
((comment == NULL && property->i18n_comment == NULL) ||
(comment && property->i18n_comment && !strcmp(property->i18n_comment, comment))))
!g_strcmp0 (property->i18n_context, context) &&
!g_strcmp0 (property->i18n_comment, comment))
return;
/* load up the command */
me = g_object_new(GLADE_COMMAND_SET_I18N_TYPE, NULL);
me->property = property;
me->translatable = translatable;
me->has_context = has_context;
me->context = g_strdup(context);
me->comment = g_strdup(comment);
me->old_translatable = property->i18n_translatable;
me->old_has_context = property->i18n_has_context;
me->old_context = g_strdup(property->i18n_context);
me->old_comment = g_strdup(property->i18n_comment);
GLADE_COMMAND(me)->description = g_strdup_printf(_("Setting i18n metadata"));;
......@@ -2307,250 +2282,6 @@ glade_command_set_i18n (GladeProperty *property,
}
/******************************************************************************
*
* set project format
*
* This command sets the format on the project.
*
*****************************************************************************/
typedef struct {
GladeCommand parent;
GladeProject *project;
GladeProjectFormat format;
GladeProjectFormat old_format;
} GladeCommandSetFormat;
GLADE_MAKE_COMMAND (GladeCommandSetFormat, glade_command_set_format);
#define GLADE_COMMAND_SET_FORMAT_TYPE (glade_command_set_format_get_type ())
#define GLADE_COMMAND_SET_FORMAT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_SET_FORMAT_TYPE, GladeCommandSetFormat))
#define GLADE_COMMAND_SET_FORMAT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_SET_FORMAT_TYPE, GladeCommandSetFormatClass))
#define GLADE_IS_COMMAND_SET_FORMAT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_SET_FORMAT_TYPE))
#define GLADE_IS_COMMAND_SET_FORMAT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_SET_FORMAT_TYPE))
static gboolean
glade_command_set_format_execute(GladeCommand *cmd)
{
GladeCommandSetFormat *me = (GladeCommandSetFormat *)cmd;
GladeProjectFormat fmt;
/* sanity check */
g_return_val_if_fail (me != NULL, TRUE);
g_return_val_if_fail (me->project != NULL, TRUE);
/* set the new format */
glade_project_set_format (me->project, me->format);
/* swap the current values with the old values to prepare for undo */
fmt = me->format;
me->format = me->old_format;
me->old_format = fmt;
return TRUE;
}
static gboolean
glade_command_set_format_undo(GladeCommand *cmd)
{
return glade_command_set_format_execute(cmd);
}
static void
glade_command_set_format_finalize(GObject *obj)
{
/* GladeCommandSetFormat *me; */
g_return_if_fail(GLADE_IS_COMMAND_SET_FORMAT(obj));
glade_command_finalize(obj);
}
static gboolean
glade_command_set_format_unifies (GladeCommand *this_cmd, GladeCommand *other_cmd)
{
/* GladeCommandSetFormat *cmd1; */
/* GladeCommandSetFormat *cmd2; */
return FALSE;
}
static void
glade_command_set_format_collapse (GladeCommand *this_cmd, GladeCommand *other_cmd)
{
/* this command is the one that will be used for an undo of the sequence of like commands */
//GladeCommandSetFormat *this = GLADE_COMMAND_SET_FORMAT (this_cmd);
/* the other command contains the values that will be used for a redo */
//GladeCommandSetFormat *other = GLADE_COMMAND_SET_FORMAT (other_cmd);
g_return_if_fail (GLADE_IS_COMMAND_SET_FORMAT (this_cmd) && GLADE_IS_COMMAND_SET_FORMAT (other_cmd));
/* no unify/collapse */
}
static void
glade_command_convert_cleanup_props (GList *properties,
GladeProjectFormat fmt)
{
GladeProperty *property;
GList *list;
for (list = properties; list; list = list->next)
{
property = list->data;
if (glade_property_original_default (property))
continue;
/* Reset any unsupported properties to thier defaults */
if ((fmt == GLADE_PROJECT_FORMAT_GTKBUILDER &&
property->klass->libglade_only) ||
(fmt == GLADE_PROJECT_FORMAT_LIBGLADE &&
property->klass->libglade_unsupported))
{
GValue value = { 0, };
glade_property_get_default (property, &value);
glade_command_set_property (property, &value);
g_value_unset (&value);
}
}
}
static gint
find_format_rejected_object (GObject *object, gpointer fmtptr)
{
GladeWidget *widget = glade_widget_get_from_gobject (object);
GladeProjectFormat fmt = GPOINTER_TO_INT (fmtptr);
if ((fmt == GLADE_PROJECT_FORMAT_GTKBUILDER &&
GWA_LIBGLADE_ONLY (widget->adaptor)) ||
/* If going in libglade format... */
(fmt == GLADE_PROJECT_FORMAT_LIBGLADE &&
/* ... and widget is unsupported by libglade */
(GWA_LIBGLADE_UNSUPPORTED (widget->adaptor) ||
/* ... and widget is a non GtkWidget object */
!GTK_IS_WIDGET (widget->object) ||
/* ... and its a non-window toplevel */
(!widget->parent && g_strcmp0 (widget->adaptor->name, "GtkWindow") && !widget->internal))))
return 0;
return -1;
}
static void
glade_command_convert_cleanup (GladeProject *project,
GladeProjectFormat fmt)
{
GladeWidget *widget;
const GList *objects, *list;
GList *l;
/* List safely delete widgets */
while ((l = g_list_find_custom ((GList *)glade_project_get_objects (project), GINT_TO_POINTER (fmt),
(GCompareFunc)find_format_rejected_object)) != NULL)
{
GList delete = { 0, };
widget = glade_widget_get_from_gobject (l->data);
delete.data = widget;
glade_command_delete (&delete);
}
/* Deal with properties of remaining widgets */
objects = glade_project_get_objects (project);
for (list = objects; list; list = list->next)
{
widget = glade_widget_get_from_gobject (list->data);
glade_command_convert_cleanup_props (widget->properties, fmt);
glade_command_convert_cleanup_props (widget->packing_properties, fmt);
}
}
/**
* glade_command_set_project_format:
* @project: a #GladeProject
* @fmt: the #GladeProjectFormat
*
* Sets the format of the project.
*/
void
glade_command_set_project_format (GladeProject *project,
GladeProjectFormat fmt)
{
GladeCommandSetFormat *me;
GList *req_libs, *list;
gchar *cat_name;
GladeCatalog *catalog;
g_return_if_fail (GLADE_IS_PROJECT (project));
if (glade_project_get_format (project) != fmt)
{
gchar *prj_name = glade_project_get_name (project);
glade_command_push_group (_("Converting %s to %s format"),
prj_name,
fmt == GLADE_PROJECT_FORMAT_LIBGLADE ? "libglade" : "Gtk+ Builder");
g_free (prj_name);
/* load up the command */
me = g_object_new(GLADE_COMMAND_SET_FORMAT_TYPE, NULL);
me->project = project;
me->format = fmt;
me->old_format = glade_project_get_format (project);
GLADE_COMMAND(me)->description = g_strdup_printf("dummy string");
glade_command_check_group(GLADE_COMMAND(me));
if ((req_libs = glade_project_required_libs (project)) != NULL)
{
for (list = req_libs; list; list = list->next)
{
cat_name = list->data;
catalog = glade_app_get_catalog (cat_name);
glade_catalog_convert_project (catalog, project, fmt);
g_free (cat_name);
}
g_list_free (req_libs);
}
glade_command_convert_cleanup (project, fmt);
/* execute the command and push it on the stack if successful
* this sets the actual format
*/
if (glade_command_set_format_execute(GLADE_COMMAND(me)))
{
glade_project_push_undo(glade_app_get_project(), GLADE_COMMAND(me));
}
else
{
g_object_unref(G_OBJECT(me));
}
/* Emit "convert-finished" signal after setting the actual format */
g_signal_emit_by_name (project, "convert-finished");
glade_command_pop_group ();
glade_editor_refresh (glade_app_get_editor ());
glade_project_verify_project_for_ui (project);
}
}
/******************************************************************************
*
* set project naming policy
......
......@@ -87,9 +87,6 @@ void glade_command_collapse (GladeCommand *command,
/************************** project *********************************/
void glade_command_set_project_format (GladeProject *project,
GladeProjectFormat fmt);
void glade_command_set_project_naming_policy (GladeProject *project,
GladeNamingPolicy policy);
......@@ -160,7 +157,6 @@ void glade_command_change_signal (GladeWidget *glade_widget,
void glade_command_set_i18n (GladeProperty *property,
gboolean translatable,
gboolean has_context,
const gchar *context,
const gchar *comment);
......
This diff is collapsed.
......@@ -148,11 +148,9 @@ void glade_editor_property_commit_no_callback (GladeEditorProper
GValue *value);
gboolean glade_editor_property_show_i18n_dialog (GtkWidget *parent,
GladeProjectFormat fmt,
gchar **text,
gchar **context,
gchar **comment,
gboolean *has_context,
gboolean *translatable);
gboolean glade_editor_property_show_resource_dialog (GladeProject *project,
GtkWidget *parent,
......@@ -176,7 +174,6 @@ gboolean glade_editor_property_show_object_dialog (GladeProject
#define GLADE_TYPE_EPROP_UNICHAR (glade_eprop_unichar_get_type())
#define GLADE_TYPE_EPROP_OBJECT (glade_eprop_object_get_type())
#define GLADE_TYPE_EPROP_OBJECTS (glade_eprop_objects_get_type())
#define GLADE_TYPE_EPROP_ADJUSTMENT (glade_eprop_adjustment_get_type())
GType glade_eprop_numeric_get_type (void) G_GNUC_CONST;
GType glade_eprop_enum_get_type (void) G_GNUC_CONST;
GType glade_eprop_flags_get_type (void) G_GNUC_CONST;
......@@ -187,7 +184,6 @@ GType glade_eprop_bool_get_type (void) G_GNUC_CONST;
GType glade_eprop_unichar_get_type (void) G_GNUC_CONST;
GType glade_eprop_object_get_type (void) G_GNUC_CONST;
GType glade_eprop_objects_get_type (void) G_GNUC_CONST;
GType glade_eprop_adjustment_get_type (void) G_GNUC_CONST;
G_END_DECLS
......
......@@ -508,10 +508,7 @@ glade_palette_item_refresh (GtkWidget *item)
glade_project_verify_widget_adaptor (project, adaptor, &support)) != NULL)
{
/* set sensitivity */
gtk_widget_set_sensitive (GTK_WIDGET (item),
!(support & (GLADE_SUPPORT_LIBGLADE_UNSUPPORTED |
GLADE_SUPPORT_LIBGLADE_ONLY |
GLADE_SUPPORT_MISMATCH)));
gtk_widget_set_sensitive (GTK_WIDGET (item), !(support & GLADE_SUPPORT_MISMATCH));
if (support & GLADE_SUPPORT_DEPRECATED)
/* XXX Todo, draw a cross overlaying the widget icon */
......
......@@ -436,24 +436,15 @@ glade_popup_create_menu (GladeWidget *widget,
GladePlaceholder *placeholder,
gboolean packing)
{
GladeProjectFormat fmt;
GladeWidgetAdaptor *current_item;
GladeProject *project;
GtkWidget *popup_menu;
GtkWidget *separator;
GList *list;
gboolean sensitive, non_window;
gboolean sensitive;
GladePlaceholder *tmp_placeholder;
gchar *book;
sensitive = (current_item = glade_palette_get_current_item (glade_app_get_palette ())) != NULL;
/* Resolve project format first... */
project = widget ? glade_widget_get_project (widget) :
placeholder ? glade_placeholder_get_project (placeholder) : glade_app_get_project ();
fmt = glade_project_get_format (project);
popup_menu = gtk_menu_new ();
if (current_item)
......@@ -478,8 +469,7 @@ glade_popup_create_menu (GladeWidget *widget,
}
glade_popup_append_item (popup_menu, NULL, _("Add widget as _toplevel"), NULL,
fmt != GLADE_PROJECT_FORMAT_LIBGLADE,
glade_popup_root_add_cb, NULL);
TRUE, glade_popup_root_add_cb, NULL);
separator = gtk_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), separator);
......@@ -497,15 +487,6 @@ glade_popup_create_menu (GladeWidget *widget,
/* paste is placholder specific when the popup is on a placeholder */
sensitive = glade_clipboard_get_has_selection (glade_app_get_clipboard ());
non_window = FALSE;
for (list = glade_app_get_clipboard ()->selection; list; list = list->next)
{
GladeWidget *gwidget = GLADE_WIDGET (list->data);
if (!GTK_IS_WIDGET (gwidget->object) ||
!gtk_widget_get_has_window (GTK_WIDGET (gwidget->object)))
non_window = TRUE;
}
if (placeholder)
glade_popup_append_item (popup_menu, GTK_STOCK_PASTE, NULL, NULL, sensitive,
......@@ -514,13 +495,10 @@ glade_popup_create_menu (GladeWidget *widget,
glade_popup_append_item (popup_menu, GTK_STOCK_PASTE, NULL, NULL, sensitive,
glade_popup_paste_cb, widget);
else
/* No toplevel non-GtkWindow pastes in libglade */
glade_popup_append_item (popup_menu, GTK_STOCK_PASTE, NULL, NULL,
sensitive && !(non_window && (fmt == GLADE_PROJECT_FORMAT_LIBGLADE)),
glade_popup_append_item (popup_menu, GTK_STOCK_PASTE, NULL, NULL, sensitive,
glade_popup_paste_cb, NULL);
glade_popup_append_item (popup_menu, GTK_STOCK_DELETE, NULL, NULL, (widget != NULL),
glade_popup_delete_cb, widget);
......@@ -692,7 +670,6 @@ void
glade_popup_palette_pop (GladeWidgetAdaptor *adaptor,
GdkEventButton *event)
{
GladeProjectFormat fmt;
GladeProject *project;
GtkWidget *popup_menu;
gchar *book = NULL;
......@@ -704,11 +681,9 @@ glade_popup_palette_pop (GladeWidgetAdaptor *adaptor,
popup_menu = gtk_menu_new ();
project = glade_app_get_project ();
fmt = glade_project_get_format (project);
glade_popup_append_item (popup_menu, NULL, _("Add widget as _toplevel"), NULL,
(fmt != GLADE_PROJECT_FORMAT_LIBGLADE),
glade_popup_root_add_cb, adaptor);
TRUE, glade_popup_root_add_cb, adaptor);
g_object_get (adaptor, "book", &book, NULL);
if (book && glade_util_have_devhelp ())
......
This diff is collapsed.
......@@ -24,9 +24,7 @@ typedef enum
{
GLADE_SUPPORT_OK = 0,
GLADE_SUPPORT_DEPRECATED = (0x01 << 0),
GLADE_SUPPORT_MISMATCH = (0x01 << 1),
GLADE_SUPPORT_LIBGLADE_UNSUPPORTED = (0x01 << 2),
GLADE_SUPPORT_LIBGLADE_ONLY = (0x01 << 3)
GLADE_SUPPORT_MISMATCH = (0x01 << 1)
} GladeSupportMask;
/**
......@@ -188,10 +186,6 @@ gboolean glade_project_get_modified (GladeProject *project);
gboolean glade_project_get_previewable (GladeProject *project);
void glade_project_set_format (GladeProject *project, GladeProjectFormat format);
GladeProjectFormat glade_project_get_format (GladeProject *project);
void glade_project_preferences (GladeProject *project);
void glade_project_verify_properties (GladeWidget *widget);
......
......@@ -98,17 +98,12 @@ glade_property_class_new (gpointer handle)
property_class->virt = TRUE;
property_class->transfer_on_paste = FALSE;
property_class->weight = -1.0;
property_class->