[Xfce4-commits] <garcon:master> Use direct macro to get private.
Nick Schermer
noreply at xfce.org
Fri Aug 2 22:04:01 CEST 2013
Updating branch refs/heads/master
to 9df2e69d105ed5d50cdf20122e6f8f033e73afeb (commit)
from 7bae1cfc4d941098e523e40c974ffbaab04fe334 (commit)
commit 9df2e69d105ed5d50cdf20122e6f8f033e73afeb
Author: Nick Schermer <nick at xfce.org>
Date: Fri Aug 2 16:18:18 2013 +0200
Use direct macro to get private.
garcon/garcon-menu-directory.c | 6 +-----
garcon/garcon-menu-item-cache.c | 6 +-----
garcon/garcon-menu-item-pool.c | 6 +-----
garcon/garcon-menu-item.c | 6 +-----
garcon/garcon-menu-merger.c | 6 +-----
garcon/garcon-menu-parser.c | 6 +-----
garcon/garcon-menu.c | 6 +-----
7 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/garcon/garcon-menu-directory.c b/garcon/garcon-menu-directory.c
index 6c5de3c..4b35863 100644
--- a/garcon/garcon-menu-directory.c
+++ b/garcon/garcon-menu-directory.c
@@ -45,10 +45,6 @@
-#define GARCON_MENU_DIRECTORY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GARCON_TYPE_MENU_DIRECTORY, GarconMenuDirectoryPrivate))
-
-
-
/* Desktop entry keys */
#if 0
static const gchar *desktop_entry_keys[] =
@@ -216,7 +212,7 @@ garcon_menu_directory_class_init (GarconMenuDirectoryClass *klass)
static void
garcon_menu_directory_init (GarconMenuDirectory *directory)
{
- directory->priv = GARCON_MENU_DIRECTORY_GET_PRIVATE (directory);
+ directory->priv = G_TYPE_INSTANCE_GET_PRIVATE (directory, GARCON_TYPE_MENU_DIRECTORY, GarconMenuDirectoryPrivate);
directory->priv->file = NULL;
directory->priv->name = NULL;
directory->priv->icon_name = NULL;
diff --git a/garcon/garcon-menu-item-cache.c b/garcon/garcon-menu-item-cache.c
index f5e09d0..5d722ed 100644
--- a/garcon/garcon-menu-item-cache.c
+++ b/garcon/garcon-menu-item-cache.c
@@ -43,10 +43,6 @@
-#define GARCON_MENU_ITEM_CACHE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GARCON_TYPE_MENU_ITEM_CACHE, GarconMenuItemCachePrivate))
-
-
-
static void garcon_menu_item_cache_finalize (GObject *object);
@@ -97,7 +93,7 @@ garcon_menu_item_cache_class_init (GarconMenuItemCacheClass *klass)
static void
garcon_menu_item_cache_init (GarconMenuItemCache *cache)
{
- cache->priv = GARCON_MENU_ITEM_CACHE_GET_PRIVATE (cache);
+ cache->priv = G_TYPE_INSTANCE_GET_PRIVATE (cache, GARCON_TYPE_MENU_ITEM_CACHE, GarconMenuItemCachePrivate);
#if GLIB_CHECK_VERSION (2, 32, 0)
g_mutex_init (&cache->priv->lock);
diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c
index e56043e..2017180 100644
--- a/garcon/garcon-menu-item-pool.c
+++ b/garcon/garcon-menu-item-pool.c
@@ -27,10 +27,6 @@
-#define GARCON_MENU_ITEM_POOL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GARCON_TYPE_MENU_ITEM_POOL, GarconMenuItemPoolPrivate))
-
-
-
static void garcon_menu_item_pool_finalize (GObject *object);
static gboolean garcon_menu_item_pool_filter_exclude (const gchar *desktop_id,
GarconMenuItem *item,
@@ -79,7 +75,7 @@ garcon_menu_item_pool_class_init (GarconMenuItemPoolClass *klass)
static void
garcon_menu_item_pool_init (GarconMenuItemPool *pool)
{
- pool->priv = GARCON_MENU_ITEM_POOL_GET_PRIVATE (pool);
+ pool->priv = G_TYPE_INSTANCE_GET_PRIVATE (pool, GARCON_TYPE_MENU_ITEM_POOL, GarconMenuItemPoolPrivate);
pool->priv->items = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
(GDestroyNotify) garcon_menu_item_unref);
}
diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
index 3c5f603..e675fec 100644
--- a/garcon/garcon-menu-item.c
+++ b/garcon/garcon-menu-item.c
@@ -33,10 +33,6 @@
-#define GARCON_MENU_ITEM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GARCON_TYPE_MENU_ITEM, GarconMenuItemPrivate))
-
-
-
/* Property identifiers */
enum
{
@@ -392,7 +388,7 @@ garcon_menu_item_element_init (GarconMenuElementIface *iface)
static void
garcon_menu_item_init (GarconMenuItem *item)
{
- item->priv = GARCON_MENU_ITEM_GET_PRIVATE (item);
+ item->priv = G_TYPE_INSTANCE_GET_PRIVATE (item, GARCON_TYPE_MENU_ITEM, GarconMenuItemPrivate);
}
diff --git a/garcon/garcon-menu-merger.c b/garcon/garcon-menu-merger.c
index fd0aa6e..f263434 100644
--- a/garcon/garcon-menu-merger.c
+++ b/garcon/garcon-menu-merger.c
@@ -37,10 +37,6 @@ typedef struct _GarconMenuMergerContext GarconMenuMergerContext;
-#define GARCON_MENU_MERGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GARCON_TYPE_MENU_MERGER, GarconMenuMergerPrivate))
-
-
-
/* Property identifiers */
enum
{
@@ -145,7 +141,7 @@ garcon_menu_merger_provider_init (GarconMenuTreeProviderIface *iface)
static void
garcon_menu_merger_init (GarconMenuMerger *merger)
{
- merger->priv = GARCON_MENU_MERGER_GET_PRIVATE (merger);
+ merger->priv = G_TYPE_INSTANCE_GET_PRIVATE (merger, GARCON_TYPE_MENU_MERGER, GarconMenuMergerPrivate);
merger->priv->tree_provider = NULL;
merger->priv->menu = NULL;
merger->priv->file_stack = NULL;
diff --git a/garcon/garcon-menu-parser.c b/garcon/garcon-menu-parser.c
index 2379b30..f97e3a9 100644
--- a/garcon/garcon-menu-parser.c
+++ b/garcon/garcon-menu-parser.c
@@ -75,10 +75,6 @@ struct _GarconMenuParserContext
-#define GARCON_MENU_PARSER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GARCON_TYPE_MENU_PARSER, GarconMenuParserPrivate))
-
-
-
/* Property identifiers */
enum
{
@@ -171,7 +167,7 @@ garcon_menu_parser_provider_init (GarconMenuTreeProviderIface *iface)
static void
garcon_menu_parser_init (GarconMenuParser *parser)
{
- parser->priv = GARCON_MENU_PARSER_GET_PRIVATE (parser);
+ parser->priv = G_TYPE_INSTANCE_GET_PRIVATE (parser, GARCON_TYPE_MENU_PARSER, GarconMenuParserPrivate);
parser->priv->file = NULL;
parser->priv->menu = NULL;
}
diff --git a/garcon/garcon-menu.c b/garcon/garcon-menu.c
index e719b8f..e23e268 100644
--- a/garcon/garcon-menu.c
+++ b/garcon/garcon-menu.c
@@ -63,10 +63,6 @@
-#define GARCON_MENU_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GARCON_TYPE_MENU, GarconMenuPrivate))
-
-
-
typedef struct _GarconMenuPair
{
gpointer first;
@@ -321,7 +317,7 @@ garcon_menu_element_init (GarconMenuElementIface *iface)
static void
garcon_menu_init (GarconMenu *menu)
{
- menu->priv = GARCON_MENU_GET_PRIVATE (menu);
+ menu->priv = G_TYPE_INSTANCE_GET_PRIVATE (menu, GARCON_TYPE_MENU, GarconMenuPrivate);
menu->priv->file = NULL;
menu->priv->tree = NULL;
menu->priv->merge_files = NULL;
More information about the Xfce4-commits
mailing list