[glade3] * gladeui/glade-app.h, gladeui/glade-base-editor.h, gladeui/glade-catalog.h, gladeui/glade-design-
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade3] * gladeui/glade-app.h, gladeui/glade-base-editor.h, gladeui/glade-catalog.h, gladeui/glade-design-
- Date: Wed, 5 Jan 2011 09:46:41 +0000 (UTC)
commit 0a0462212d7aa37a06f25209b8e3f4b1db24165c
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Wed Jan 5 18:53:24 2011 +0900
* gladeui/glade-app.h, gladeui/glade-base-editor.h, gladeui/glade-catalog.h,
gladeui/glade-design-layout.h, gladeui/glade-design-view.h, gladeui/glade-editable.h,
gladeui/glade-editor-property.h, gladeui/glade-named-icon-chooser-dialog.h,
gladeui/glade-project.h: Aligning some indentation in headers, adding padding
to core object classes for possible future expansion.
Glade core api now officially sealed and ABI stable.
ChangeLog | 10 ++++++++++
gladeui/Makefile.am | 2 +-
gladeui/glade-app.h | 9 ++++++++-
gladeui/glade-base-editor.h | 7 +++++++
gladeui/glade-catalog.h | 4 ++--
gladeui/glade-design-layout.h | 16 ++++++++++------
gladeui/glade-design-view.h | 10 +++++++---
gladeui/glade-editable.h | 23 +++++++++++------------
gladeui/glade-editor-property.h | 2 --
gladeui/glade-named-icon-chooser-dialog.h | 15 ++++++++++-----
gladeui/glade-project.h | 9 +++++++++
11 files changed, 75 insertions(+), 32 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b15f438..8d78f8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,16 @@
- Plugin makes actions invisible instead of removing them
- Everything updated for new sealed api
+ * gladeui/Makefile.am: slight reordering in build
+
+ * gladeui/glade-app.h, gladeui/glade-base-editor.h, gladeui/glade-catalog.h,
+ gladeui/glade-design-layout.h, gladeui/glade-design-view.h, gladeui/glade-editable.h,
+ gladeui/glade-editor-property.h, gladeui/glade-named-icon-chooser-dialog.h,
+ gladeui/glade-project.h: Aligning some indentation in headers, adding padding
+ to core object classes for possible future expansion.
+
+ Glade core api now officially sealed and ABI stable.
+
2011-01-04 Johannes Schmid <jhs gnome org>
* data/gladeui-2.0.pc.in: Fix include paths and library name
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index dde2b92..7e036ce 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -57,6 +57,7 @@ libgladeui_2_la_SOURCES = \
glade-property.c \
glade-signal-class.c \
glade-signal.c \
+ glade-widget-action.c \
glade-editable.c \
glade-editor-table.c \
glade-editor-property.c \
@@ -85,7 +86,6 @@ libgladeui_2_la_SOURCES = \
glade-popup.h \
glade-marshallers.h \
glade-accumulators.h \
- glade-widget-action.c \
glade-name-context.c \
glade-displayable-values.c \
glade-cell-renderer-icon.c
diff --git a/gladeui/glade-app.h b/gladeui/glade-app.h
index 32e5326..5becf2f 100644
--- a/gladeui/glade-app.h
+++ b/gladeui/glade-app.h
@@ -55,7 +55,14 @@ struct _GladeAppClass
GObjectClass parent_class;
/* signals */
- void (* signal_editor_created) (GladeApp *app, GladeSignalEditor *signal_editor);
+ void (* signal_editor_created) (GladeApp *app, GladeSignalEditor *signal_editor);
+
+ void (* glade_reserved1) (void);
+ void (* glade_reserved2) (void);
+ void (* glade_reserved3) (void);
+ void (* glade_reserved4) (void);
+ void (* glade_reserved5) (void);
+ void (* glade_reserved6) (void);
};
diff --git a/gladeui/glade-base-editor.h b/gladeui/glade-base-editor.h
index f99a3b3..59b0be4 100644
--- a/gladeui/glade-base-editor.h
+++ b/gladeui/glade-base-editor.h
@@ -55,6 +55,13 @@ struct _GladeBaseEditorClass
GladeWidget * (*build_child) (GladeBaseEditor *, GladeWidget *, GType);
gboolean (*delete_child) (GladeBaseEditor *, GladeWidget *, GladeWidget *);
gboolean (*move_child) (GladeBaseEditor *, GladeWidget *, GladeWidget *);
+
+ void (* glade_reserved1) (void);
+ void (* glade_reserved2) (void);
+ void (* glade_reserved3) (void);
+ void (* glade_reserved4) (void);
+ void (* glade_reserved5) (void);
+ void (* glade_reserved6) (void);
};
diff --git a/gladeui/glade-catalog.h b/gladeui/glade-catalog.h
index 4e15da6..ca3c2ab 100644
--- a/gladeui/glade-catalog.h
+++ b/gladeui/glade-catalog.h
@@ -48,8 +48,8 @@ typedef void (*GladeCatalogInitFunc) (const gchar *name);
typedef struct {
- gint major;
- gint minor;
+ gint major;
+ gint minor;
} GladeTargetableVersion;
diff --git a/gladeui/glade-design-layout.h b/gladeui/glade-design-layout.h
index ef19b6a..924c376 100644
--- a/gladeui/glade-design-layout.h
+++ b/gladeui/glade-design-layout.h
@@ -48,19 +48,23 @@ enum
struct _GladeDesignLayout
{
- GtkBin parent_instance;
+ GtkBin parent_instance;
- GladeDesignLayoutPrivate *priv;
+ GladeDesignLayoutPrivate *priv;
};
struct _GladeDesignLayoutClass
{
- GtkBinClass parent_class;
+ GtkBinClass parent_class;
- gboolean (*widget_event) (GladeProject *project,
- GladeWidget *gwidget,
- GdkEvent *event);
+ gboolean (* widget_event) (GladeProject *project,
+ GladeWidget *gwidget,
+ GdkEvent *event);
+ void (* glade_reserved1) (void);
+ void (* glade_reserved2) (void);
+ void (* glade_reserved3) (void);
+ void (* glade_reserved4) (void);
};
diff --git a/gladeui/glade-design-view.h b/gladeui/glade-design-view.h
index fb1d1d7..105c384 100644
--- a/gladeui/glade-design-view.h
+++ b/gladeui/glade-design-view.h
@@ -46,15 +46,19 @@ typedef struct _GladeDesignViewClass GladeDesignViewClass;
struct _GladeDesignView
{
- GtkVBox parent_instance;
+ GtkVBox parent_instance;
- GladeDesignViewPrivate *priv;
+ GladeDesignViewPrivate *priv;
};
struct _GladeDesignViewClass
{
- GtkVBoxClass parent_class;
+ GtkVBoxClass parent_class;
+ void (* glade_reserved1) (void);
+ void (* glade_reserved2) (void);
+ void (* glade_reserved3) (void);
+ void (* glade_reserved4) (void);
};
diff --git a/gladeui/glade-editable.h b/gladeui/glade-editable.h
index 385290c..f74400a 100644
--- a/gladeui/glade-editable.h
+++ b/gladeui/glade-editable.h
@@ -18,24 +18,23 @@ typedef struct _GladeEditableIface GladeEditableIface;
typedef enum
{
- GLADE_PAGE_GENERAL,
- GLADE_PAGE_COMMON,
- GLADE_PAGE_PACKING,
- GLADE_PAGE_ATK,
- GLADE_PAGE_QUERY
+ GLADE_PAGE_GENERAL,
+ GLADE_PAGE_COMMON,
+ GLADE_PAGE_PACKING,
+ GLADE_PAGE_ATK,
+ GLADE_PAGE_QUERY
} GladeEditorPageType;
struct _GladeEditableIface
{
- GTypeInterface g_iface;
-
- /* virtual table */
- void (* load) (GladeEditable *editable,
- GladeWidget *widget);
- void (* set_show_name) (GladeEditable *editable,
- gboolean show_name);
+ GTypeInterface g_iface;
+ /* virtual table */
+ void (* load) (GladeEditable *editable,
+ GladeWidget *widget);
+ void (* set_show_name) (GladeEditable *editable,
+ gboolean show_name);
};
GType glade_editable_get_type (void) G_GNUC_CONST;
diff --git a/gladeui/glade-editor-property.h b/gladeui/glade-editor-property.h
index fd75882..d1678ae 100644
--- a/gladeui/glade-editor-property.h
+++ b/gladeui/glade-editor-property.h
@@ -5,8 +5,6 @@
G_BEGIN_DECLS
-
-
/*******************************************************************************
Boiler plate macros (inspired from glade-command.c)
*******************************************************************************/
diff --git a/gladeui/glade-named-icon-chooser-dialog.h b/gladeui/glade-named-icon-chooser-dialog.h
index dd42b4e..97c9736 100644
--- a/gladeui/glade-named-icon-chooser-dialog.h
+++ b/gladeui/glade-named-icon-chooser-dialog.h
@@ -40,18 +40,23 @@ typedef struct _GladeNamedIconChooserDialogClass GladeNamedIconChooserDialogCl
struct _GladeNamedIconChooserDialog
{
- GtkDialog parent_instance;
+ GtkDialog parent_instance;
- GladeNamedIconChooserDialogPrivate *priv;
+ GladeNamedIconChooserDialogPrivate *priv;
};
struct _GladeNamedIconChooserDialogClass
{
- GtkDialogClass parent_class;
+ GtkDialogClass parent_class;
- void (* icon_activated) (GladeNamedIconChooserDialog *dialog);
+ void (* icon_activated) (GladeNamedIconChooserDialog *dialog);
- void (* selection_changed) (GladeNamedIconChooserDialog *dialog);
+ void (* selection_changed) (GladeNamedIconChooserDialog *dialog);
+
+ void (* glade_reserved1) (void);
+ void (* glade_reserved2) (void);
+ void (* glade_reserved3) (void);
+ void (* glade_reserved4) (void);
};
GType glade_named_icon_chooser_dialog_get_type (void) G_GNUC_CONST;
diff --git a/gladeui/glade-project.h b/gladeui/glade-project.h
index 99b2bce..1fc493f 100644
--- a/gladeui/glade-project.h
+++ b/gladeui/glade-project.h
@@ -99,6 +99,15 @@ struct _GladeProjectClass
void (*close) (GladeProject *project);
void (*parse_finished) (GladeProject *project);
+
+ void (* glade_reserved1) (void);
+ void (* glade_reserved2) (void);
+ void (* glade_reserved3) (void);
+ void (* glade_reserved4) (void);
+ void (* glade_reserved5) (void);
+ void (* glade_reserved6) (void);
+ void (* glade_reserved7) (void);
+ void (* glade_reserved8) (void);
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]