Commit d414139f authored by Juan Pablo Ugarte's avatar Juan Pablo Ugarte

Convert every object to use G_DEFINE_TYPE_WITH_CODE() or G_ADD_PRIVATE() macros

Fixed function prototype identation and spacing.
parent 6c347e17
...@@ -53,9 +53,6 @@ ...@@ -53,9 +53,6 @@
#define GLADE_CONFIG_FILENAME "glade.conf" #define GLADE_CONFIG_FILENAME "glade.conf"
#define GLADE_APP_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), \
GLADE_TYPE_APP, \
GladeAppPrivate))
enum enum
{ {
DOC_SEARCH, DOC_SEARCH,
...@@ -91,15 +88,15 @@ static gchar *lib_dir = NULL; ...@@ -91,15 +88,15 @@ static gchar *lib_dir = NULL;
static GladeApp *singleton_app = NULL; static GladeApp *singleton_app = NULL;
static gboolean check_initialised = FALSE; static gboolean check_initialised = FALSE;
G_DEFINE_TYPE (GladeApp, glade_app, G_TYPE_OBJECT); G_DEFINE_TYPE_WITH_PRIVATE (GladeApp, glade_app, G_TYPE_OBJECT);
/***************************************************************** /*****************************************************************
* GObjectClass * * GObjectClass *
*****************************************************************/ *****************************************************************/
static GObject * static GObject *
glade_app_constructor (GType type, glade_app_constructor (GType type,
guint n_construct_properties, guint n_construct_properties,
GObjectConstructParam * construct_properties) GObjectConstructParam *construct_properties)
{ {
GObject *object; GObject *object;
...@@ -122,7 +119,7 @@ glade_app_constructor (GType type, ...@@ -122,7 +119,7 @@ glade_app_constructor (GType type,
static void static void
glade_app_dispose (GObject * app) glade_app_dispose (GObject *app)
{ {
GladeAppPrivate *priv = GLADE_APP (app)->priv; GladeAppPrivate *priv = GLADE_APP (app)->priv;
...@@ -143,7 +140,7 @@ glade_app_dispose (GObject * app) ...@@ -143,7 +140,7 @@ glade_app_dispose (GObject * app)
} }
static void static void
glade_app_finalize (GObject * app) glade_app_finalize (GObject *app)
{ {
g_free (catalogs_dir); g_free (catalogs_dir);
g_free (modules_dir); g_free (modules_dir);
...@@ -271,10 +268,10 @@ glade_app_get_lib_dir (void) ...@@ -271,10 +268,10 @@ glade_app_get_lib_dir (void)
} }
static void static void
pointer_mode_register_icon (GtkIconFactory *factory, pointer_mode_register_icon (GtkIconFactory *factory,
const gchar *icon_name, const gchar *icon_name,
GladePointerMode mode, GladePointerMode mode,
GtkIconSize size) GtkIconSize size)
{ {
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
...@@ -289,10 +286,10 @@ pointer_mode_register_icon (GtkIconFactory *factory, ...@@ -289,10 +286,10 @@ pointer_mode_register_icon (GtkIconFactory *factory,
static void static void
register_stock_icon (GtkIconFactory *factory, register_stock_icon (GtkIconFactory *factory,
const gchar *stock_id, const gchar *stock_id,
const gchar *icon_name, const gchar *icon_name,
const gchar *file_name, const gchar *file_name,
GtkIconSize size) GtkIconSize size)
{ {
GtkIconTheme *icon_theme = gtk_icon_theme_get_default (); GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
...@@ -370,7 +367,7 @@ static void ...@@ -370,7 +367,7 @@ static void
glade_app_init (GladeApp *app) glade_app_init (GladeApp *app)
{ {
static gboolean initialized = FALSE; static gboolean initialized = FALSE;
GladeAppPrivate *priv = app->priv = GLADE_APP_GET_PRIVATE (app); GladeAppPrivate *priv = app->priv = glade_app_get_instance_private (app);
singleton_app = app; singleton_app = app;
...@@ -407,7 +404,7 @@ glade_app_event_handler (GdkEvent *event, gpointer data) ...@@ -407,7 +404,7 @@ glade_app_event_handler (GdkEvent *event, gpointer data)
} }
static void static void
glade_app_class_init (GladeAppClass * klass) glade_app_class_init (GladeAppClass *klass)
{ {
GObjectClass *object_class; GObjectClass *object_class;
...@@ -465,9 +462,7 @@ glade_app_class_init (GladeAppClass * klass) ...@@ -465,9 +462,7 @@ glade_app_class_init (GladeAppClass * klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
0, NULL, NULL, 0, NULL, NULL,
_glade_marshal_VOID__OBJECT, _glade_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_OBJECT); G_TYPE_NONE, 1, G_TYPE_OBJECT);
g_type_class_add_private (klass, sizeof (GladeAppPrivate));
gdk_event_handler_set (glade_app_event_handler, NULL, NULL); gdk_event_handler_set (glade_app_event_handler, NULL, NULL);
} }
...@@ -633,7 +628,7 @@ glade_app_get (void) ...@@ -633,7 +628,7 @@ glade_app_get (void)
} }
void void
glade_app_set_window (GtkWidget * window) glade_app_set_window (GtkWidget *window)
{ {
GladeApp *app = glade_app_get (); GladeApp *app = glade_app_get ();
...@@ -641,7 +636,7 @@ glade_app_set_window (GtkWidget * window) ...@@ -641,7 +636,7 @@ glade_app_set_window (GtkWidget * window)
} }
GladeCatalog * GladeCatalog *
glade_app_get_catalog (const gchar * name) glade_app_get_catalog (const gchar *name)
{ {
GladeApp *app = glade_app_get (); GladeApp *app = glade_app_get ();
GList *list; GList *list;
...@@ -659,7 +654,7 @@ glade_app_get_catalog (const gchar * name) ...@@ -659,7 +654,7 @@ glade_app_get_catalog (const gchar * name)
} }
gboolean gboolean
glade_app_get_catalog_version (const gchar * name, gint * major, gint * minor) glade_app_get_catalog_version (const gchar *name, gint *major, gint *minor)
{ {
GladeCatalog *catalog = glade_app_get_catalog (name); GladeCatalog *catalog = glade_app_get_catalog (name);
...@@ -725,7 +720,7 @@ glade_app_get_config (void) ...@@ -725,7 +720,7 @@ glade_app_get_config (void)
} }
gboolean gboolean
glade_app_is_project_loaded (const gchar * project_path) glade_app_is_project_loaded (const gchar *project_path)
{ {
GladeApp *app; GladeApp *app;
GList *list; GList *list;
...@@ -757,7 +752,7 @@ glade_app_is_project_loaded (const gchar * project_path) ...@@ -757,7 +752,7 @@ glade_app_is_project_loaded (const gchar * project_path)
* Returns: A #GladeProject, or NULL if no such open project was found * Returns: A #GladeProject, or NULL if no such open project was found
*/ */
GladeProject * GladeProject *
glade_app_get_project_by_path (const gchar * project_path) glade_app_get_project_by_path (const gchar *project_path)
{ {
GladeApp *app; GladeApp *app;
GList *l; GList *l;
...@@ -788,7 +783,7 @@ glade_app_get_project_by_path (const gchar * project_path) ...@@ -788,7 +783,7 @@ glade_app_get_project_by_path (const gchar * project_path)
} }
void void
glade_app_add_project (GladeProject * project) glade_app_add_project (GladeProject *project)
{ {
GladeApp *app; GladeApp *app;
...@@ -805,7 +800,7 @@ glade_app_add_project (GladeProject * project) ...@@ -805,7 +800,7 @@ glade_app_add_project (GladeProject * project)
} }
void void
glade_app_remove_project (GladeProject * project) glade_app_remove_project (GladeProject *project)
{ {
GladeApp *app; GladeApp *app;
g_return_if_fail (GLADE_IS_PROJECT (project)); g_return_if_fail (GLADE_IS_PROJECT (project));
......
...@@ -114,15 +114,15 @@ enum ...@@ -114,15 +114,15 @@ enum
N_PROPERTIES N_PROPERTIES
}; };
G_DEFINE_TYPE (GladeBaseEditor, glade_base_editor, GTK_TYPE_BOX) G_DEFINE_TYPE_WITH_PRIVATE (GladeBaseEditor, glade_base_editor, GTK_TYPE_BOX)
static GParamSpec *properties[N_PROPERTIES]; static GParamSpec *properties[N_PROPERTIES];
static guint glade_base_editor_signals[LAST_SIGNAL] = { 0 }; static guint glade_base_editor_signals[LAST_SIGNAL] = { 0 };
static void glade_base_editor_set_container (GladeBaseEditor *editor, static void glade_base_editor_set_container (GladeBaseEditor *editor,
GObject *container); GObject *container);
static void glade_base_editor_block_callbacks (GladeBaseEditor *editor, static void glade_base_editor_block_callbacks (GladeBaseEditor *editor,
gboolean block); gboolean block);
static void static void
...@@ -199,8 +199,9 @@ get_children_model_for_child_type (GladeBaseEditor *editor, GType type) ...@@ -199,8 +199,9 @@ get_children_model_for_child_type (GladeBaseEditor *editor, GType type)
static gboolean static gboolean
glade_base_editor_get_type_info (GladeBaseEditor *e, glade_base_editor_get_type_info (GladeBaseEditor *e,
GtkTreeIter *retiter, GtkTreeIter *retiter,
GType child_type, ...) GType child_type,
...)
{ {
GtkTreeModel *model; GtkTreeModel *model;
GtkTreeIter iter; GtkTreeIter iter;
...@@ -234,7 +235,7 @@ glade_base_editor_get_type_info (GladeBaseEditor *e, ...@@ -234,7 +235,7 @@ glade_base_editor_get_type_info (GladeBaseEditor *e,
static gchar * static gchar *
glade_base_editor_get_display_name (GladeBaseEditor *editor, glade_base_editor_get_display_name (GladeBaseEditor *editor,
GladeWidget *gchild) GladeWidget *gchild)
{ {
gchar *retval; gchar *retval;
g_signal_emit (editor, g_signal_emit (editor,
...@@ -245,8 +246,8 @@ glade_base_editor_get_display_name (GladeBaseEditor *editor, ...@@ -245,8 +246,8 @@ glade_base_editor_get_display_name (GladeBaseEditor *editor,
static void static void
glade_base_editor_fill_store_real (GladeBaseEditor *e, glade_base_editor_fill_store_real (GladeBaseEditor *e,
GladeWidget *gwidget, GladeWidget *gwidget,
GtkTreeIter *parent) GtkTreeIter *parent)
{ {
GList *children, *l; GList *children, *l;
GtkTreeIter iter; GtkTreeIter iter;
...@@ -322,8 +323,8 @@ glade_base_editor_project_widget_name_changed (GladeProject *project, ...@@ -322,8 +323,8 @@ glade_base_editor_project_widget_name_changed (GladeProject *project,
static GladeWidget * static GladeWidget *
glade_base_editor_delegate_build_child (GladeBaseEditor *editor, glade_base_editor_delegate_build_child (GladeBaseEditor *editor,
GladeWidget *parent, GladeWidget *parent,
GType type) GType type)
{ {
GladeWidget *child = NULL; GladeWidget *child = NULL;
g_signal_emit (editor, glade_base_editor_signals[SIGNAL_BUILD_CHILD], g_signal_emit (editor, glade_base_editor_signals[SIGNAL_BUILD_CHILD],
...@@ -333,8 +334,8 @@ glade_base_editor_delegate_build_child (GladeBaseEditor *editor, ...@@ -333,8 +334,8 @@ glade_base_editor_delegate_build_child (GladeBaseEditor *editor,
static gboolean static gboolean
glade_base_editor_delegate_delete_child (GladeBaseEditor *editor, glade_base_editor_delegate_delete_child (GladeBaseEditor *editor,
GladeWidget *parent, GladeWidget *parent,
GladeWidget *child) GladeWidget *child)
{ {
gboolean retval; gboolean retval;
...@@ -397,7 +398,7 @@ glade_base_editor_clear (GladeBaseEditor *editor) ...@@ -397,7 +398,7 @@ glade_base_editor_clear (GladeBaseEditor *editor)
} }
static void static void
glade_base_editor_treeview_cursor_changed (GtkTreeView *treeview, glade_base_editor_treeview_cursor_changed (GtkTreeView *treeview,
GladeBaseEditor *editor) GladeBaseEditor *editor)
{ {
GladeBaseEditorPrivate *e = editor->priv; GladeBaseEditorPrivate *e = editor->priv;
...@@ -468,8 +469,8 @@ glade_base_editor_set_cursor (GladeBaseEditor *e, GtkTreeIter *iter) ...@@ -468,8 +469,8 @@ glade_base_editor_set_cursor (GladeBaseEditor *e, GtkTreeIter *iter)
static gboolean static gboolean
glade_base_editor_find_child_real (GladeBaseEditor *e, glade_base_editor_find_child_real (GladeBaseEditor *e,
GladeWidget *gchild, GladeWidget *gchild,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
GtkTreeModel *model = e->priv->model; GtkTreeModel *model = e->priv->model;
GtkTreeIter child_iter; GtkTreeIter child_iter;
...@@ -497,8 +498,8 @@ glade_base_editor_find_child_real (GladeBaseEditor *e, ...@@ -497,8 +498,8 @@ glade_base_editor_find_child_real (GladeBaseEditor *e,
static gboolean static gboolean
glade_base_editor_find_child (GladeBaseEditor *e, glade_base_editor_find_child (GladeBaseEditor *e,
GladeWidget *child, GladeWidget *child,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
if (gtk_tree_model_get_iter_first (e->priv->model, iter)) if (gtk_tree_model_get_iter_first (e->priv->model, iter))
return glade_base_editor_find_child_real (e, child, iter); return glade_base_editor_find_child_real (e, child, iter);
...@@ -517,8 +518,8 @@ glade_base_editor_select_child (GladeBaseEditor *e, GladeWidget *child) ...@@ -517,8 +518,8 @@ glade_base_editor_select_child (GladeBaseEditor *e, GladeWidget *child)
static void static void
glade_base_editor_child_change_type (GladeBaseEditor *editor, glade_base_editor_child_change_type (GladeBaseEditor *editor,
GtkTreeIter *iter, GtkTreeIter *iter,
GType type) GType type)
{ {
GladeWidget *gchild; GladeWidget *gchild;
GObject *child; GObject *child;
...@@ -591,9 +592,9 @@ glade_base_editor_type_changed (GtkComboBox *widget, GladeBaseEditor *e) ...@@ -591,9 +592,9 @@ glade_base_editor_type_changed (GtkComboBox *widget, GladeBaseEditor *e)
static void static void
glade_base_editor_child_type_edited (GtkCellRendererText *cell, glade_base_editor_child_type_edited (GtkCellRendererText *cell,
const gchar *path_string, const gchar *path_string,
const gchar *new_text, const gchar *new_text,
GladeBaseEditor *editor) GladeBaseEditor *editor)
{ {
GladeBaseEditorPrivate *e = editor->priv; GladeBaseEditorPrivate *e = editor->priv;
GtkTreeModel *child_class; GtkTreeModel *child_class;
...@@ -648,7 +649,7 @@ glade_base_editor_child_type_edited (GtkCellRendererText *cell, ...@@ -648,7 +649,7 @@ glade_base_editor_child_type_edited (GtkCellRendererText *cell,
static void static void
glade_base_editor_reorder_children (GladeBaseEditor *editor, glade_base_editor_reorder_children (GladeBaseEditor *editor,
GtkTreeIter *child) GtkTreeIter *child)
{ {
GtkTreeModel *model = editor->priv->model; GtkTreeModel *model = editor->priv->model;
GladeWidget *gchild; GladeWidget *gchild;
...@@ -764,7 +765,7 @@ glade_base_editor_add_child (GladeBaseEditor *editor, ...@@ -764,7 +765,7 @@ glade_base_editor_add_child (GladeBaseEditor *editor,
static void static void
glade_base_editor_add_item_activate (GtkMenuItem *menuitem, glade_base_editor_add_item_activate (GtkMenuItem *menuitem,
GladeBaseEditor *e) GladeBaseEditor *e)
{ {
GObject *item = G_OBJECT (menuitem); GObject *item = G_OBJECT (menuitem);
...@@ -861,8 +862,8 @@ glade_base_editor_popup (GladeBaseEditor *editor, GladeWidget *widget) ...@@ -861,8 +862,8 @@ glade_base_editor_popup (GladeBaseEditor *editor, GladeWidget *widget)
} }
static gint static gint
glade_base_editor_popup_handler (GtkWidget *treeview, glade_base_editor_popup_handler (GtkWidget *treeview,
GdkEventButton *event, GdkEventButton *event,
GladeBaseEditor *e) GladeBaseEditor *e)
{ {
GtkTreePath *path; GtkTreePath *path;
...@@ -936,8 +937,8 @@ glade_base_editor_delete_child (GladeBaseEditor *e) ...@@ -936,8 +937,8 @@ glade_base_editor_delete_child (GladeBaseEditor *e)
static gboolean static gboolean
glade_base_editor_treeview_key_press_event (GtkWidget *widget, glade_base_editor_treeview_key_press_event (GtkWidget *widget,
GdkEventKey *event, GdkEventKey *event,
GladeBaseEditor *e) GladeBaseEditor *e)
{ {
if (event->keyval == GDK_KEY_Delete) if (event->keyval == GDK_KEY_Delete)
...@@ -1018,8 +1019,8 @@ glade_base_editor_update_treeview_idle (gpointer data) ...@@ -1018,8 +1019,8 @@ glade_base_editor_update_treeview_idle (gpointer data)
} }
static void static void
glade_base_editor_project_widget_name_changed (GladeProject *project, glade_base_editor_project_widget_name_changed (GladeProject *project,
GladeWidget *widget, GladeWidget *widget,
GladeBaseEditor *editor) GladeBaseEditor *editor)
{ {
GladeWidget *selected_child; GladeWidget *selected_child;
...@@ -1094,9 +1095,9 @@ glade_base_editor_drag_and_drop_idle (gpointer data) ...@@ -1094,9 +1095,9 @@ glade_base_editor_drag_and_drop_idle (gpointer data)
} }
static void static void
glade_base_editor_row_inserted (GtkTreeModel *model, glade_base_editor_row_inserted (GtkTreeModel *model,
GtkTreePath *path, GtkTreePath *path,
GtkTreeIter *iter, GtkTreeIter *iter,
GladeBaseEditor *e) GladeBaseEditor *e)
{ {
e->priv->iter = *iter; e->priv->iter = *iter;
...@@ -1131,8 +1132,8 @@ glade_base_editor_project_remove_widget (GladeProject *project, ...@@ -1131,8 +1132,8 @@ glade_base_editor_project_remove_widget (GladeProject *project,
} }
static void static void
glade_base_editor_project_add_widget (GladeProject *project, glade_base_editor_project_add_widget (GladeProject *project,
GladeWidget *widget, GladeWidget *widget,
GladeBaseEditor *e) GladeBaseEditor *e)
{ {
if (e->priv->updating_treeview) if (e->priv->updating_treeview)
...@@ -1151,9 +1152,9 @@ glade_base_editor_project_add_widget (GladeProject *project, ...@@ -1151,9 +1152,9 @@ glade_base_editor_project_add_widget (GladeProject *project,
static gboolean static gboolean
glade_base_editor_update_display_name (GtkTreeModel *model, glade_base_editor_update_display_name (GtkTreeModel *model,
GtkTreePath *path, GtkTreePath *path,
GtkTreeIter *iter, GtkTreeIter *iter,
gpointer data) gpointer data)
{ {
GladeBaseEditor *editor = data; GladeBaseEditor *editor = data;
GladeWidget *gchild; GladeWidget *gchild;
...@@ -1172,9 +1173,9 @@ glade_base_editor_update_display_name (GtkTreeModel *model, ...@@ -1172,9 +1173,9 @@ glade_base_editor_update_display_name (GtkTreeModel *model,
} }
static void static void
glade_base_editor_project_changed (GladeProject *project, glade_base_editor_project_changed (GladeProject *project,
GladeCommand *command, GladeCommand *command,
gboolean forward, gboolean forward,
GladeBaseEditor *editor) GladeBaseEditor *editor)
{ {
gtk_tree_model_foreach (editor->priv->model, gtk_tree_model_foreach (editor->priv->model,
...@@ -1184,7 +1185,7 @@ glade_base_editor_project_changed (GladeProject *project, ...@@ -1184,7 +1185,7 @@ glade_base_editor_project_changed (GladeProject *project,
static void static void
glade_base_editor_project_disconnect (GladeBaseEditor * editor) glade_base_editor_project_disconnect (GladeBaseEditor *editor)
{ {
GladeBaseEditorPrivate *e = editor->priv; GladeBaseEditorPrivate *e = editor->priv;
...@@ -1274,16 +1275,6 @@ glade_base_editor_set_container (GladeBaseEditor *editor, GObject *container) ...@@ -1274,16 +1275,6 @@ glade_base_editor_set_container (GladeBaseEditor *editor, GObject *container)
} }
/*************************** GladeBaseEditor Class ****************************/ /*************************** GladeBaseEditor Class ****************************/
static void
glade_base_editor_finalize (GObject *object)
{
GladeBaseEditor *cobj = GLADE_BASE_EDITOR (object);
g_free (cobj->priv);
G_OBJECT_CLASS (glade_base_editor_parent_class)->finalize (object);
}
static void static void
glade_base_editor_dispose (GObject *object) glade_base_editor_dispose (GObject *object)
{ {
...@@ -1298,10 +1289,10 @@ glade_base_editor_dispose (GObject *object) ...@@ -1298,10 +1289,10 @@ glade_base_editor_dispose (GObject *object)
} }
static void static void
glade_base_editor_set_property (GObject *object, glade_base_editor_set_property (GObject *object,
guint prop_id, guint prop_id,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GladeBaseEditor *editor = GLADE_BASE_EDITOR (object); GladeBaseEditor *editor = GLADE_BASE_EDITOR (object);
...@@ -1317,9 +1308,9 @@ glade_base_editor_set_property (GObject *object, ...@@ -1317,9 +1308,9 @@ glade_base_editor_set_property (GObject *object,
} }
static void static void
glade_base_editor_get_property (GObject *object, glade_base_editor_get_property (GObject *object,
guint prop_id, guint prop_id,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GladeBaseEditor *editor = GLADE_BASE_EDITOR (object); GladeBaseEditor *editor = GLADE_BASE_EDITOR (object);
...@@ -1339,8 +1330,8 @@ glade_base_editor_get_property (GObject *object, ...@@ -1339,8 +1330,8 @@ glade_base_editor_get_property (GObject *object,
/* Default handlers */ /* Default handlers */
static gboolean static gboolean
glade_base_editor_change_type (GladeBaseEditor *editor, glade_base_editor_change_type (GladeBaseEditor *editor,
GladeWidget *gchild, GladeWidget *gchild,
GType type) GType type)
{ {
GladeWidget *parent, *gchild_new; GladeWidget *parent, *gchild_new;
GList *children, *l; GList *children, *l;
...@@ -1429,7 +1420,7 @@ glade_base_editor_change_type (GladeBaseEditor *editor, ...@@ -1429,7 +1420,7 @@ glade_base_editor_change_type (GladeBaseEditor *editor,
static gchar * static gchar *
glade_base_editor_get_display_name_impl (GladeBaseEditor *editor, glade_base_editor_get_display_name_impl (GladeBaseEditor *editor,
GladeWidget *gchild) GladeWidget *gchild)
{ {
return g_strdup (glade_widget_get_name (gchild)); return g_strdup (glade_widget_get_name (gchild));
} }
...@@ -1446,8 +1437,8 @@ glade_base_editor_build_child (GladeBaseEditor *editor, ...@@ -1446,8 +1437,8 @@ glade_base_editor_build_child (GladeBaseEditor *editor,
static gboolean static gboolean
glade_base_editor_move_child (GladeBaseEditor *editor, glade_base_editor_move_child (GladeBaseEditor *editor,
GladeWidget *gparent, GladeWidget *gparent,
GladeWidget *gchild) GladeWidget *gchild)
{ {
GList list = { 0, }; GList list = { 0, };
...@@ -1462,8 +1453,8 @@ glade_base_editor_move_child (GladeBaseEditor *editor, ...@@ -1462,8 +1453,8 @@ glade_base_editor_move_child (GladeBaseEditor *editor,
static gboolean static gboolean
glade_base_editor_delete_child_impl (GladeBaseEditor *editor, glade_base_editor_delete_child_impl (GladeBaseEditor *editor,
GladeWidget *gparent, GladeWidget *gparent,
GladeWidget *gchild) GladeWidget *gchild)
{ {
GList list = { 0, }; GList list = { 0, };
...@@ -1480,7 +1471,6 @@ glade_base_editor_class_init (GladeBaseEditorClass *klass) ...@@ -1480,7 +1471,6 @@ glade_base_editor_class_init (GladeBaseEditorClass *klass)
glade_base_editor_parent_class = g_type_class_peek_parent (klass); glade_base_editor_parent_class = g_type_class_peek_parent (klass);
object_class->finalize = glade_base_editor_finalize;
object_class->dispose = glade_base_editor_dispose; object_class->dispose = glade_base_editor_dispose;
object_class->set_property = glade_base_editor_set_property; object_class->set_property = glade_base_editor_set_property;
object_class->get_property = glade_base_editor_get_property; object_class->get_property = glade_base_editor_get_property;
...@@ -1665,9 +1655,9 @@ glade_base_editor_realize_callback (GtkWidget *widget, gpointer user_data) ...@@ -1665,9 +1655,9 @@ glade_base_editor_realize_callback (GtkWidget *widget, gpointer user_data)
static void static void
glade_base_editor_switch_page (GtkNotebook *notebook, glade_base_editor_switch_page (GtkNotebook *notebook,
GtkWidget *page, GtkWidget *page,
guint page_num, guint page_num,
GladeBaseEditor *editor) GladeBaseEditor *editor)
{ {
GladeBaseEditorPrivate *e = editor->priv; GladeBaseEditorPrivate *e = editor->priv;
...@@ -1707,7 +1697,7 @@ glade_base_editor_init (GladeBaseEditor *editor) ...@@ -1707,7 +1697,7 @@ glade_base_editor_init (GladeBaseEditor *editor)
GTK_ORIENTATION_VERTICAL); GTK_ORIENTATION_VERTICAL);
gtk_box_set_spacing (GTK_BOX (editor), 8); gtk_box_set_spacing (GTK_BOX (editor), 8);
e = editor->priv = g_new0 (GladeBaseEditorPrivate, 1); e = editor->priv = glade_base_editor_get_instance_private (editor);
/* Paned */ /* Paned */
e->paned = paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL); e->paned = paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
...@@ -2009,7 +1999,7 @@ glade_base_editor_append_types (GladeBaseEditor *editor, GType parent_type, ...) ...@@ -2009,7 +1999,7 @@ glade_base_editor_append_types (GladeBaseEditor *editor, GType parent_type, ...)
*/ */
void void
glade_base_editor_add_default_properties (GladeBaseEditor *editor, glade_base_editor_add_default_properties (GladeBaseEditor *editor,
GladeWidget *gchild) GladeWidget *gchild)
{ {
GtkTreeIter combo_iter; GtkTreeIter combo_iter;
GtkWidget *label, *entry; GtkWidget *label, *entry;
...@@ -2076,8 +2066,9 @@ glade_base_editor_add_default_properties (GladeBaseEditor *editor, ...@@ -2076,8 +2066,9 @@ glade_base_editor_add_default_properties (GladeBaseEditor *editor,
*/ */
void void
glade_base_editor_add_properties (GladeBaseEditor *editor, glade_base_editor_add_properties (GladeBaseEditor *editor,
GladeWidget *gchild, GladeWidget *gchild,
gboolean packing, ...) gboolean packing,
...)
{