[gedit] menu-extension: use G_DECLARE macros
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] menu-extension: use G_DECLARE macros
- Date: Tue, 21 Apr 2015 19:57:09 +0000 (UTC)
commit 1ddcd8b3c8cee0d4a57fc7c455089de79ad3cf6a
Author: Paolo Borelli <pborelli gnome org>
Date: Tue Apr 21 16:59:31 2015 +0200
menu-extension: use G_DECLARE macros
gedit/gedit-menu-extension.c | 59 +++++++++++++++---------------------------
gedit/gedit-menu-extension.h | 23 +---------------
2 files changed, 23 insertions(+), 59 deletions(-)
---
diff --git a/gedit/gedit-menu-extension.c b/gedit/gedit-menu-extension.c
index 384c558..8bc2827 100644
--- a/gedit/gedit-menu-extension.c
+++ b/gedit/gedit-menu-extension.c
@@ -24,13 +24,14 @@
static guint last_merge_id = 0;
-
-typedef struct _GeditMenuExtensionPrivate
+struct _GeditMenuExtension
{
+ GObject parent_instance;
+
GMenu *menu;
guint merge_id;
gboolean dispose_has_run;
-} GeditMenuExtensionPrivate;
+};
enum
{
@@ -38,21 +39,20 @@ enum
PROP_MENU
};
-G_DEFINE_TYPE_WITH_PRIVATE (GeditMenuExtension, gedit_menu_extension, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GeditMenuExtension, gedit_menu_extension, G_TYPE_OBJECT)
static void
gedit_menu_extension_dispose (GObject *object)
{
GeditMenuExtension *menu = GEDIT_MENU_EXTENSION (object);
- GeditMenuExtensionPrivate *priv = gedit_menu_extension_get_instance_private (menu);
- if (!priv->dispose_has_run)
+ if (!menu->dispose_has_run)
{
gedit_menu_extension_remove_items (menu);
- priv->dispose_has_run = TRUE;
+ menu->dispose_has_run = TRUE;
}
- g_clear_object (&priv->menu);
+ g_clear_object (&menu->menu);
G_OBJECT_CLASS (gedit_menu_extension_parent_class)->dispose (object);
}
@@ -64,12 +64,11 @@ gedit_menu_extension_get_property (GObject *object,
GParamSpec *pspec)
{
GeditMenuExtension *menu = GEDIT_MENU_EXTENSION (object);
- GeditMenuExtensionPrivate *priv = gedit_menu_extension_get_instance_private (menu);
switch (prop_id)
{
case PROP_MENU:
- g_value_set_object (value, priv->menu);
+ g_value_set_object (value, menu->menu);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -84,12 +83,11 @@ gedit_menu_extension_set_property (GObject *object,
GParamSpec *pspec)
{
GeditMenuExtension *menu = GEDIT_MENU_EXTENSION (object);
- GeditMenuExtensionPrivate *priv = gedit_menu_extension_get_instance_private (menu);
switch (prop_id)
{
case PROP_MENU:
- priv->menu = g_value_dup_object (value);
+ menu->menu = g_value_dup_object (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -120,11 +118,7 @@ gedit_menu_extension_class_init (GeditMenuExtensionClass *klass)
static void
gedit_menu_extension_init (GeditMenuExtension *menu)
{
- GeditMenuExtensionPrivate *priv;
-
- priv = gedit_menu_extension_get_instance_private (menu);
-
- priv->merge_id = ++last_merge_id;
+ menu->merge_id = ++last_merge_id;
}
GeditMenuExtension *
@@ -137,17 +131,13 @@ void
gedit_menu_extension_append_menu_item (GeditMenuExtension *menu,
GMenuItem *item)
{
- GeditMenuExtensionPrivate *priv;
-
g_return_if_fail (GEDIT_IS_MENU_EXTENSION (menu));
g_return_if_fail (G_IS_MENU_ITEM (item));
- priv = gedit_menu_extension_get_instance_private (menu);
-
- if (priv->menu != NULL)
+ if (menu->menu != NULL)
{
- g_menu_item_set_attribute (item, "gedit-merge-id", "u", priv->merge_id);
- g_menu_append_item (priv->menu, item);
+ g_menu_item_set_attribute (item, "gedit-merge-id", "u", menu->merge_id);
+ g_menu_append_item (menu->menu, item);
}
}
@@ -155,41 +145,34 @@ void
gedit_menu_extension_prepend_menu_item (GeditMenuExtension *menu,
GMenuItem *item)
{
- GeditMenuExtensionPrivate *priv;
-
g_return_if_fail (GEDIT_IS_MENU_EXTENSION (menu));
g_return_if_fail (G_IS_MENU_ITEM (item));
- priv = gedit_menu_extension_get_instance_private (menu);
-
- if (priv->menu != NULL)
+ if (menu->menu != NULL)
{
- g_menu_item_set_attribute (item, "gedit-merge-id", "u", priv->merge_id);
- g_menu_prepend_item (priv->menu, item);
+ g_menu_item_set_attribute (item, "gedit-merge-id", "u", menu->merge_id);
+ g_menu_prepend_item (menu->menu, item);
}
}
void
gedit_menu_extension_remove_items (GeditMenuExtension *menu)
{
- GeditMenuExtensionPrivate *priv;
gint i, n_items;
g_return_if_fail (GEDIT_IS_MENU_EXTENSION (menu));
- priv = gedit_menu_extension_get_instance_private (menu);
-
- n_items = g_menu_model_get_n_items (G_MENU_MODEL (priv->menu));
+ n_items = g_menu_model_get_n_items (G_MENU_MODEL (menu->menu));
i = 0;
while (i < n_items)
{
guint id = 0;
- if (g_menu_model_get_item_attribute (G_MENU_MODEL (priv->menu),
+ if (g_menu_model_get_item_attribute (G_MENU_MODEL (menu->menu),
i, "gedit-merge-id", "u", &id) &&
- id == priv->merge_id)
+ id == menu->merge_id)
{
- g_menu_remove (priv->menu, i);
+ g_menu_remove (menu->menu, i);
n_items--;
}
else
diff --git a/gedit/gedit-menu-extension.h b/gedit/gedit-menu-extension.h
index bc1454c..58efe25 100644
--- a/gedit/gedit-menu-extension.h
+++ b/gedit/gedit-menu-extension.h
@@ -26,28 +26,9 @@
G_BEGIN_DECLS
-#define GEDIT_TYPE_MENU_EXTENSION (gedit_menu_extension_get_type ())
-#define GEDIT_MENU_EXTENSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GEDIT_TYPE_MENU_EXTENSION, GeditMenuExtension))
-#define GEDIT_MENU_EXTENSION_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GEDIT_TYPE_MENU_EXTENSION, GeditMenuExtension const))
-#define GEDIT_MENU_EXTENSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEDIT_TYPE_MENU_EXTENSION,
GeditMenuExtensionClass))
-#define GEDIT_IS_MENU_EXTENSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GEDIT_TYPE_MENU_EXTENSION))
-#define GEDIT_IS_MENU_EXTENSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEDIT_TYPE_MENU_EXTENSION))
-#define GEDIT_MENU_EXTENSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEDIT_TYPE_MENU_EXTENSION,
GeditMenuExtensionClass))
+#define GEDIT_TYPE_MENU_EXTENSION (gedit_menu_extension_get_type ())
-typedef struct _GeditMenuExtension GeditMenuExtension;
-typedef struct _GeditMenuExtensionClass GeditMenuExtensionClass;
-
-struct _GeditMenuExtension
-{
- GObject parent;
-};
-
-struct _GeditMenuExtensionClass
-{
- GObjectClass parent_class;
-};
-
-GType gedit_menu_extension_get_type (void) G_GNUC_CONST;
+G_DECLARE_FINAL_TYPE (GeditMenuExtension, gedit_menu_extension, GEDIT, MENU_EXTENSION, GObject)
GeditMenuExtension *gedit_menu_extension_new (GMenu *menu);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]