From a148392ed7b023e2b54901518ad5ddd895ec95c9 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Mon, 4 Aug 2008 18:26:29 +0200 Subject: [PATCH] Rename FoobarDetails to FoobarPrivate; that does the trick for gtk-doc it seems. Also, fix a typo in docs/libmmanager-gtk/Makefile.am --- docs/libmmanager-gtk/Makefile.am | 2 +- libmmanager-gtk/mm-gtk-application-view.c | 8 ++++---- libmmanager-gtk/mm-gtk-application-view.h | 4 ++-- libmmanager-gtk/mm-gtk-filter-builder.c | 8 ++++---- libmmanager-gtk/mm-gtk-filter-builder.h | 4 ++-- libmmanager-gtk/mm-gtk-hit-view.c | 8 ++++---- libmmanager-gtk/mm-gtk-hit-view.h | 4 ++-- libmmanager/mm-application.c | 12 ++++++------ libmmanager/mm-application.h | 4 ++-- libmmanager/mm-category.c | 12 ++++++------ libmmanager/mm-category.h | 4 ++-- libmmanager/mm-dbus-application.c | 8 ++++---- libmmanager/mm-dbus-application.h | 4 ++-- libmmanager/mm-filter-param.c | 8 ++++---- libmmanager/mm-filter-param.h | 4 ++-- libmmanager/mm-filter.c | 12 ++++++------ libmmanager/mm-filter.h | 4 ++-- libmmanager/mm-hit-collection.c | 12 ++++++------ libmmanager/mm-hit-collection.h | 4 ++-- libmmanager/mm-hit.c | 10 +++++----- libmmanager/mm-hit.h | 4 ++-- libmmanager/mm-manager.c | 8 ++++---- libmmanager/mm-manager.h | 4 ++-- libmmanager/mm-module-manager.c | 10 +++++----- libmmanager/mm-module-manager.h | 4 ++-- libmmanager/mm-module.c | 12 ++++++------ libmmanager/mm-module.h | 4 ++-- 27 files changed, 91 insertions(+), 91 deletions(-) diff --git a/docs/libmmanager-gtk/Makefile.am b/docs/libmmanager-gtk/Makefile.am index c69e67e..dd60a08 100644 --- a/docs/libmmanager-gtk/Makefile.am +++ b/docs/libmmanager-gtk/Makefile.am @@ -46,5 +46,5 @@ clean: clean-am MAINTAINERCLEANFILES = \ *~ \ *.txt \ - libmmanger-gtk.types \ + libmmanager-gtk.types \ Makefile.in diff --git a/libmmanager-gtk/mm-gtk-application-view.c b/libmmanager-gtk/mm-gtk-application-view.c index e4a8443..05fdcc4 100644 --- a/libmmanager-gtk/mm-gtk-application-view.c +++ b/libmmanager-gtk/mm-gtk-application-view.c @@ -28,9 +28,9 @@ #include #define MM_GTK_APPLICATION_VIEW_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_GTK_TYPE_APPLICATION_VIEW, MMGtkApplicationViewDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_GTK_TYPE_APPLICATION_VIEW, MMGtkApplicationViewPrivate)) -struct _MMGtkApplicationViewDetails { +struct _MMGtkApplicationViewPrivate { MMGtkApplicationStore *store; }; @@ -99,7 +99,7 @@ impl_constructor (GType type, guint n_construct_properties, { GObject *object; MMGtkApplicationView *view; - MMGtkApplicationViewDetails *details; + MMGtkApplicationViewPrivate *details; GtkCellRenderer *renderer; GtkTreeViewColumn *col; GtkTreeSelection *selection; @@ -200,7 +200,7 @@ mm_gtk_application_view_class_init (MMGtkApplicationViewClass *klass) 1, MM_TYPE_MAPPLICATION_TYPE); - g_type_class_add_private (klass, sizeof (MMGtkApplicationViewDetails)); + g_type_class_add_private (klass, sizeof (MMGtkApplicationViewPrivate)); } static void diff --git a/libmmanager-gtk/mm-gtk-application-view.h b/libmmanager-gtk/mm-gtk-application-view.h index 5c15d0a..445bda2 100644 --- a/libmmanager-gtk/mm-gtk-application-view.h +++ b/libmmanager-gtk/mm-gtk-application-view.h @@ -57,11 +57,11 @@ typedef struct _MMGtkApplicationView MMGtkApplicationView; typedef struct _MMGtkApplicationViewClass MMGtkApplicationViewClass; -typedef struct _MMGtkApplicationViewDetails MMGtkApplicationViewDetails; +typedef struct _MMGtkApplicationViewPrivate MMGtkApplicationViewPrivate; struct _MMGtkApplicationView { GtkTreeView parent; - MMGtkApplicationViewDetails *details; + MMGtkApplicationViewPrivate *details; }; struct _MMGtkApplicationViewClass { diff --git a/libmmanager-gtk/mm-gtk-filter-builder.c b/libmmanager-gtk/mm-gtk-filter-builder.c index 1893e37..ee3bfbb 100644 --- a/libmmanager-gtk/mm-gtk-filter-builder.c +++ b/libmmanager-gtk/mm-gtk-filter-builder.c @@ -35,9 +35,9 @@ G_DEFINE_TYPE (MMGtkFilterBuilder, mm_gtk_filter_builder, GTK_TYPE_VBOX); #define MM_GTK_FILTER_BUILDER_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_GTK_TYPE_FILTER_BUILDER, MMGtkFilterBuilderDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_GTK_TYPE_FILTER_BUILDER, MMGtkFilterBuilderPrivate)) -struct _MMGtkFilterBuilderDetails { +struct _MMGtkFilterBuilderPrivate { GtkListStore *filter_store; MMGtkAttributeStore *attribute_store; GtkWidget *filter_view; @@ -74,7 +74,7 @@ mm_gtk_filter_builder_class_init (MMGtkFilterBuilderClass *klass) oclass->finalize = mm_gtk_filter_builder_finalize; - g_type_class_add_private (klass, sizeof (MMGtkFilterBuilderDetails)); + g_type_class_add_private (klass, sizeof (MMGtkFilterBuilderPrivate)); } static void @@ -211,7 +211,7 @@ filter_param_attr_cell_data_func (GtkTreeViewColumn *column, static void mm_gtk_filter_builder_init (MMGtkFilterBuilder *self) { - MMGtkFilterBuilderDetails *details = self->details = + MMGtkFilterBuilderPrivate *details = self->details = MM_GTK_FILTER_BUILDER_GET_PRIVATE (self); GtkWidget *filter_view; GtkTreeViewColumn *column; diff --git a/libmmanager-gtk/mm-gtk-filter-builder.h b/libmmanager-gtk/mm-gtk-filter-builder.h index df3765e..dd24051 100644 --- a/libmmanager-gtk/mm-gtk-filter-builder.h +++ b/libmmanager-gtk/mm-gtk-filter-builder.h @@ -54,11 +54,11 @@ typedef struct _MMGtkFilterBuilder MMGtkFilterBuilder; typedef struct _MMGtkFilterBuilderClass MMGtkFilterBuilderClass; -typedef struct _MMGtkFilterBuilderDetails MMGtkFilterBuilderDetails; +typedef struct _MMGtkFilterBuilderPrivate MMGtkFilterBuilderPrivate; struct _MMGtkFilterBuilder { GtkVBox parent; - MMGtkFilterBuilderDetails *details; + MMGtkFilterBuilderPrivate *details; }; struct _MMGtkFilterBuilderClass { diff --git a/libmmanager-gtk/mm-gtk-hit-view.c b/libmmanager-gtk/mm-gtk-hit-view.c index 0062356..2f9089d 100644 --- a/libmmanager-gtk/mm-gtk-hit-view.c +++ b/libmmanager-gtk/mm-gtk-hit-view.c @@ -31,9 +31,9 @@ G_DEFINE_TYPE (MMGtkHitView, mm_gtk_hit_view, GTK_TYPE_TREE_VIEW) #define MM_GTK_HIT_VIEW_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_GTK_TYPE_HIT_VIEW, MMGtkHitViewDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_GTK_TYPE_HIT_VIEW, MMGtkHitViewPrivate)) -struct _MMGtkHitViewDetails { +struct _MMGtkHitViewPrivate { MMGtkHitStore *hit_store; MMHitCollection *collection; }; @@ -43,13 +43,13 @@ mm_gtk_hit_view_class_init (MMGtkHitViewClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (MMGtkHitViewDetails)); + g_type_class_add_private (klass, sizeof (MMGtkHitViewPrivate)); } static void mm_gtk_hit_view_init (MMGtkHitView *self) { - MMGtkHitViewDetails *details = self->details = MM_GTK_HIT_VIEW_GET_PRIVATE (self); + MMGtkHitViewPrivate *details = self->details = MM_GTK_HIT_VIEW_GET_PRIVATE (self); GtkTreeViewColumn *column; GtkCellRenderer *pix_renderer; GtkCellRenderer *text_renderer; diff --git a/libmmanager-gtk/mm-gtk-hit-view.h b/libmmanager-gtk/mm-gtk-hit-view.h index c177744..2f5493e 100644 --- a/libmmanager-gtk/mm-gtk-hit-view.h +++ b/libmmanager-gtk/mm-gtk-hit-view.h @@ -54,11 +54,11 @@ typedef struct _MMGtkHitView MMGtkHitView; typedef struct _MMGtkHitViewClass MMGtkHitViewClass; -typedef struct _MMGtkHitViewDetails MMGtkHitViewDetails; +typedef struct _MMGtkHitViewPrivate MMGtkHitViewPrivate; struct _MMGtkHitView { GtkTreeView parent; - MMGtkHitViewDetails *details; + MMGtkHitViewPrivate *details; }; struct _MMGtkHitViewClass { diff --git a/libmmanager/mm-application.c b/libmmanager/mm-application.c index 105229a..d4ff8f7 100644 --- a/libmmanager/mm-application.c +++ b/libmmanager/mm-application.c @@ -29,7 +29,7 @@ #include "mm-type-builtins.h" #define MM_APPLICATION_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_APPLICATION, MMApplicationDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_APPLICATION, MMApplicationPrivate)) G_DEFINE_TYPE (MMApplication, mm_application, G_TYPE_OBJECT); @@ -38,7 +38,7 @@ enum { PROP_SUPPORTED_TYPE }; -struct _MMApplicationDetails { +struct _MMApplicationPrivate { GDesktopAppInfo *info; char *id; MMApplicationType supported_type; @@ -59,7 +59,7 @@ mm_application_get_property (GObject *o, GValue *value, GParamSpec *pspec) { - MMApplicationDetails *details = MM_APPLICATION (o)->details; + MMApplicationPrivate *details = MM_APPLICATION (o)->details; switch (prop_id) { case PROP_SUPPORTED_TYPE: @@ -76,7 +76,7 @@ mm_application_set_property (GObject *o, const GValue *value, GParamSpec *pspec) { - MMApplicationDetails *details = MM_APPLICATION (o)->details; + MMApplicationPrivate *details = MM_APPLICATION (o)->details; switch (prop_id) { case PROP_SUPPORTED_TYPE: @@ -105,13 +105,13 @@ mm_application_class_init (MMApplicationClass *klass) MM_APPLICATION_NONE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private (klass, sizeof (MMApplicationDetails)); + g_type_class_add_private (klass, sizeof (MMApplicationPrivate)); } static void mm_application_init (MMApplication *a) { - MMApplicationDetails *details = a->details = MM_APPLICATION_GET_PRIVATE (a); + MMApplicationPrivate *details = a->details = MM_APPLICATION_GET_PRIVATE (a); details->info = NULL; details->supported_type = MM_APPLICATION_NONE; diff --git a/libmmanager/mm-application.h b/libmmanager/mm-application.h index 0f089a4..6e977a9 100644 --- a/libmmanager/mm-application.h +++ b/libmmanager/mm-application.h @@ -53,12 +53,12 @@ */ typedef struct _MMApplication MMApplication; -typedef struct _MMApplicationDetails MMApplicationDetails; +typedef struct _MMApplicationPrivate MMApplicationPrivate; typedef struct _MMApplicationClass MMApplicationClass; struct _MMApplication { GObject parent_object; - MMApplicationDetails *details; + MMApplicationPrivate *details; }; /** diff --git a/libmmanager/mm-category.c b/libmmanager/mm-category.c index 62ed539..95399d0 100644 --- a/libmmanager/mm-category.c +++ b/libmmanager/mm-category.c @@ -28,11 +28,11 @@ #define MM_CATEGORY_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_CATEGORY, MMCategoryDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_CATEGORY, MMCategoryPrivate)) G_DEFINE_TYPE (MMCategory, mm_category, G_TYPE_OBJECT); -struct _MMCategoryDetails { +struct _MMCategoryPrivate { char *name; GIcon *icon; MMApplication *application; @@ -41,7 +41,7 @@ struct _MMCategoryDetails { static void mm_category_finalize (GObject *o) { - MMCategoryDetails *details = MM_CATEGORY (o)->details; + MMCategoryPrivate *details = MM_CATEGORY (o)->details; g_free (details->name); @@ -60,13 +60,13 @@ mm_category_class_init (MMCategoryClass *klass) { G_OBJECT_CLASS (klass)->finalize = mm_category_finalize; - g_type_class_add_private (klass, sizeof (MMCategoryDetails)); + g_type_class_add_private (klass, sizeof (MMCategoryPrivate)); } static void mm_category_init (MMCategory *c) { - MMCategoryDetails *details = c->details = MM_CATEGORY_GET_PRIVATE (c); + MMCategoryPrivate *details = c->details = MM_CATEGORY_GET_PRIVATE (c); details->name = NULL; details->icon = NULL; @@ -92,7 +92,7 @@ mm_category_set_attributes (MMCategory *category, const char *name, GIcon *icon) { - MMCategoryDetails *details = category->details; + MMCategoryPrivate *details = category->details; details->name = g_strdup (name); details->application = g_object_ref (app); diff --git a/libmmanager/mm-category.h b/libmmanager/mm-category.h index 22f1a15..170c470 100644 --- a/libmmanager/mm-category.h +++ b/libmmanager/mm-category.h @@ -54,12 +54,12 @@ */ typedef struct _MMCategory MMCategory; -typedef struct _MMCategoryDetails MMCategoryDetails; +typedef struct _MMCategoryPrivate MMCategoryPrivate; typedef struct _MMCategoryClass MMCategoryClass; struct _MMCategory { GObject parent_object; - MMCategoryDetails *details; + MMCategoryPrivate *details; }; /** diff --git a/libmmanager/mm-dbus-application.c b/libmmanager/mm-dbus-application.c index 4b31e12..c638e10 100644 --- a/libmmanager/mm-dbus-application.c +++ b/libmmanager/mm-dbus-application.c @@ -27,9 +27,9 @@ #include #define MM_DBUS_APPLICATION_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_DBUS_APPLICATION, MMDBusApplicationDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_DBUS_APPLICATION, MMDBusApplicationPrivate)) -struct _MMDBusApplicationDetails { +struct _MMDBusApplicationPrivate { char *path; }; @@ -133,13 +133,13 @@ mm_dbus_application_class_init (MMDBusApplicationClass *klass) app_class->get_categories = mm_dbus_application_get_categories; G_OBJECT_CLASS (klass)->finalize = mm_dbus_application_finalize; - g_type_class_add_private (klass, sizeof (MMDBusApplicationDetails)); + g_type_class_add_private (klass, sizeof (MMDBusApplicationPrivate)); } static void mm_dbus_application_init (MMDBusApplication *app) { - MMDBusApplicationDetails *details = app->details = MM_DBUS_APPLICATION_GET_PRIVATE (app); + MMDBusApplicationPrivate *details = app->details = MM_DBUS_APPLICATION_GET_PRIVATE (app); details->path = NULL; } diff --git a/libmmanager/mm-dbus-application.h b/libmmanager/mm-dbus-application.h index 128f190..953849d 100644 --- a/libmmanager/mm-dbus-application.h +++ b/libmmanager/mm-dbus-application.h @@ -60,11 +60,11 @@ typedef struct _MMDBusApplication MMDBusApplication; */ typedef struct _MMDBusApplicationClass MMDBusApplicationClass; -typedef struct _MMDBusApplicationDetails MMDBusApplicationDetails; +typedef struct _MMDBusApplicationPrivate MMDBusApplicationPrivate; struct _MMDBusApplication { MMApplication parent; - MMDBusApplicationDetails *details; + MMDBusApplicationPrivate *details; }; struct _MMDBusApplicationClass { diff --git a/libmmanager/mm-filter-param.c b/libmmanager/mm-filter-param.c index 7a7ba47..5d0721d 100644 --- a/libmmanager/mm-filter-param.c +++ b/libmmanager/mm-filter-param.c @@ -25,9 +25,9 @@ #include #define MM_FILTER_PARAM_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_FILTER_PARAM, MMFilterParamDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_FILTER_PARAM, MMFilterParamPrivate)) -struct _MMFilterParamDetails { +struct _MMFilterParamPrivate { GValue *value; MMAttribute *attribute; MMComparisionOperator op; @@ -47,7 +47,7 @@ mm_filter_param_finalize (GObject *o) static void mm_filter_param_init (MMFilterParam *fp) { - MMFilterParamDetails *details = fp->details = MM_FILTER_PARAM_GET_PRIVATE (fp); + MMFilterParamPrivate *details = fp->details = MM_FILTER_PARAM_GET_PRIVATE (fp); details->value = NULL; details->attribute = NULL; @@ -59,7 +59,7 @@ mm_filter_param_class_init (MMFilterParamClass *klass) { G_OBJECT_CLASS (klass)->finalize = mm_filter_param_finalize; - g_type_class_add_private (klass, sizeof (MMFilterParamDetails)); + g_type_class_add_private (klass, sizeof (MMFilterParamPrivate)); } /* public methods */ diff --git a/libmmanager/mm-filter-param.h b/libmmanager/mm-filter-param.h index bc720b3..9d003dd 100644 --- a/libmmanager/mm-filter-param.h +++ b/libmmanager/mm-filter-param.h @@ -56,13 +56,13 @@ */ typedef struct _MMFilterParam MMFilterParam; -typedef struct _MMFilterParamDetails MMFilterParamDetails; +typedef struct _MMFilterParamPrivate MMFilterParamPrivate; typedef struct _MMFilterParamClass MMFilterParamClass; struct _MMFilterParam { GObject parent; - MMFilterParamDetails *details; + MMFilterParamPrivate *details; }; struct _MMFilterParamClass { diff --git a/libmmanager/mm-filter.c b/libmmanager/mm-filter.c index 16a6ca4..41ceef0 100644 --- a/libmmanager/mm-filter.c +++ b/libmmanager/mm-filter.c @@ -24,9 +24,9 @@ #include "mm-filter.h" #define MM_FILTER_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_FILTER, MMFilterDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_FILTER, MMFilterPrivate)) -struct _MMFilterDetails { +struct _MMFilterPrivate { GList *filter_params; }; @@ -42,7 +42,7 @@ unref_obj (gpointer data, static void unref_all_fps (MMFilter *f) { - MMFilterDetails *details = f->details; + MMFilterPrivate *details = f->details; g_list_foreach (details->filter_params, unref_obj, NULL); } @@ -68,7 +68,7 @@ mm_filter_finalize (GObject *o) static void mm_filter_init (MMFilter *f) { - MMFilterDetails *details = f->details = MM_FILTER_GET_PRIVATE (f); + MMFilterPrivate *details = f->details = MM_FILTER_GET_PRIVATE (f); details->filter_params = NULL; } @@ -77,7 +77,7 @@ mm_filter_class_init (MMFilterClass *klass) { G_OBJECT_CLASS (klass)->finalize = mm_filter_finalize; - g_type_class_add_private (klass, sizeof (MMFilterDetails)); + g_type_class_add_private (klass, sizeof (MMFilterPrivate)); } /* public methods */ @@ -108,7 +108,7 @@ void mm_filter_add_filtering_param (MMFilter *filter, MMFilterParam *fp) { - MMFilterDetails *details = filter->details; + MMFilterPrivate *details = filter->details; g_return_if_fail (MM_IS_FILTER_PARAM (fp)); diff --git a/libmmanager/mm-filter.h b/libmmanager/mm-filter.h index 3879cdd..93742b0 100644 --- a/libmmanager/mm-filter.h +++ b/libmmanager/mm-filter.h @@ -53,12 +53,12 @@ */ typedef struct _MMFilter MMFilter; -typedef struct _MMFilterDetails MMFilterDetails; +typedef struct _MMFilterPrivate MMFilterPrivate; typedef struct _MMFilterClass MMFilterClass; struct _MMFilter { GObject parent_object; - MMFilterDetails *details; + MMFilterPrivate *details; }; struct _MMFilterClass { diff --git a/libmmanager/mm-hit-collection.c b/libmmanager/mm-hit-collection.c index 291ca9e..0d0cb46 100644 --- a/libmmanager/mm-hit-collection.c +++ b/libmmanager/mm-hit-collection.c @@ -24,11 +24,11 @@ #include "mm-hit-collection.h" #define MM_HIT_COLLECTION_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_HIT_COLLECTION, MMHitCollectionDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_HIT_COLLECTION, MMHitCollectionPrivate)) G_DEFINE_TYPE (MMHitCollection, mm_hit_collection, G_TYPE_OBJECT); -struct _MMHitCollectionDetails { +struct _MMHitCollectionPrivate { GPtrArray *hits; guint current_offset; }; @@ -57,13 +57,13 @@ mm_hit_collection_class_init (MMHitCollectionClass *klass) { G_OBJECT_CLASS (klass)->finalize = mm_hit_collection_finalize; - g_type_class_add_private (klass, sizeof (MMHitCollectionDetails)); + g_type_class_add_private (klass, sizeof (MMHitCollectionPrivate)); } static void mm_hit_collection_init (MMHitCollection *c) { - MMHitCollectionDetails *details = c->details = MM_HIT_COLLECTION_GET_PRIVATE (c); + MMHitCollectionPrivate *details = c->details = MM_HIT_COLLECTION_GET_PRIVATE (c); details->hits = g_ptr_array_new (); details->current_offset = 0; @@ -102,7 +102,7 @@ void mm_hit_collection_add_hit (MMHitCollection *collection, MMHit *hit) { - MMHitCollectionDetails *details = collection->details; + MMHitCollectionPrivate *details = collection->details; g_ptr_array_add (details->hits, g_object_ref (hit)); } @@ -120,7 +120,7 @@ mm_hit_collection_add_hit (MMHitCollection *collection, MMHit * mm_hit_collection_get_next_hit (MMHitCollection *collection) { - MMHitCollectionDetails *details = collection->details; + MMHitCollectionPrivate *details = collection->details; MMHit *hit; if (details->hits->len == 0 || diff --git a/libmmanager/mm-hit-collection.h b/libmmanager/mm-hit-collection.h index e3d84c3..978425a 100644 --- a/libmmanager/mm-hit-collection.h +++ b/libmmanager/mm-hit-collection.h @@ -52,12 +52,12 @@ */ typedef struct _MMHitCollection MMHitCollection; -typedef struct _MMHitCollectionDetails MMHitCollectionDetails; +typedef struct _MMHitCollectionPrivate MMHitCollectionPrivate; typedef struct _MMHitCollectionClass MMHitCollectionClass; struct _MMHitCollection { GObject parent_object; - MMHitCollectionDetails *details; + MMHitCollectionPrivate *details; }; struct _MMHitCollectionClass { diff --git a/libmmanager/mm-hit.c b/libmmanager/mm-hit.c index 1d5d154..5a64be5 100644 --- a/libmmanager/mm-hit.c +++ b/libmmanager/mm-hit.c @@ -26,11 +26,11 @@ #include "mm-utils.h" #define MM_HIT_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_HIT, MMHitDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_HIT, MMHitPrivate)) G_DEFINE_TYPE (MMHit, mm_hit, G_TYPE_OBJECT); -struct _MMHitDetails { +struct _MMHitPrivate { GHashTable *attributes; }; @@ -42,7 +42,7 @@ typedef struct { static void mm_hit_finalize (GObject *o) { - MMHitDetails *details = MM_HIT (o)->details; + MMHitPrivate *details = MM_HIT (o)->details; g_hash_table_destroy (details->attributes); @@ -62,7 +62,7 @@ pair_free (gpointer data) static void mm_hit_init (MMHit *h) { - MMHitDetails *details = h->details = MM_HIT_GET_PRIVATE (h); + MMHitPrivate *details = h->details = MM_HIT_GET_PRIVATE (h); details->attributes = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, pair_free); } @@ -74,7 +74,7 @@ mm_hit_class_init (MMHitClass *klass) oclass->finalize = mm_hit_finalize; - g_type_class_add_private (klass, sizeof (MMHitDetails)); + g_type_class_add_private (klass, sizeof (MMHitPrivate)); } static void diff --git a/libmmanager/mm-hit.h b/libmmanager/mm-hit.h index ce039f2..6bfd565 100644 --- a/libmmanager/mm-hit.h +++ b/libmmanager/mm-hit.h @@ -55,12 +55,12 @@ */ typedef struct _MMHit MMHit; -typedef struct _MMHitDetails MMHitDetails; +typedef struct _MMHitPrivate MMHitPrivate; typedef struct _MMHitClass MMHitClass; struct _MMHit { GObject parent_object; - MMHitDetails *details; + MMHitPrivate *details; }; struct _MMHitClass { diff --git a/libmmanager/mm-manager.c b/libmmanager/mm-manager.c index c951556..5f61314 100644 --- a/libmmanager/mm-manager.c +++ b/libmmanager/mm-manager.c @@ -29,11 +29,11 @@ G_DEFINE_TYPE (MMManager, mm_manager, G_TYPE_OBJECT); #define MM_MANAGER_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_MANAGER, MMManagerDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_MANAGER, MMManagerPrivate)) MMManager* mm_manager_singleton = NULL; -struct _MMManagerDetails { +struct _MMManagerPrivate { MMModuleManager *module_manager; GHashTable *applications; }; @@ -53,7 +53,7 @@ mm_manager_class_init (MMManagerClass *klass) { G_OBJECT_CLASS (klass)->finalize = mm_manager_finalize; - g_type_class_add_private (klass, sizeof (MMManagerDetails)); + g_type_class_add_private (klass, sizeof (MMManagerPrivate)); } static void @@ -192,7 +192,7 @@ populate_applications_table (MMManager *manager) static void mm_manager_init (MMManager *manager) { - MMManagerDetails *details = manager->details = MM_MANAGER_GET_PRIVATE (manager); + MMManagerPrivate *details = manager->details = MM_MANAGER_GET_PRIVATE (manager); details->module_manager = MM_MODULE_MANAGER (g_object_new (MM_TYPE_MODULE_MANAGER, NULL)); details->applications = g_hash_table_new_full (g_str_hash, g_str_equal, diff --git a/libmmanager/mm-manager.h b/libmmanager/mm-manager.h index e909ceb..5efad6e 100644 --- a/libmmanager/mm-manager.h +++ b/libmmanager/mm-manager.h @@ -54,12 +54,12 @@ */ typedef struct _MMManager MMManager; -typedef struct _MMManagerDetails MMManagerDetails; +typedef struct _MMManagerPrivate MMManagerPrivate; typedef struct _MMManagerClass MMManagerClass; struct _MMManager { GObject parent_object; - MMManagerDetails *details; + MMManagerPrivate *details; }; struct _MMManagerClass { diff --git a/libmmanager/mm-module-manager.c b/libmmanager/mm-module-manager.c index a71dee0..8b7ce3d 100644 --- a/libmmanager/mm-module-manager.c +++ b/libmmanager/mm-module-manager.c @@ -28,11 +28,11 @@ #include "mm-module.h" #define MM_MODULE_MANAGER_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_MODULE_MANAGER, MMModuleManagerDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_MODULE_MANAGER, MMModuleManagerPrivate)) G_DEFINE_TYPE (MMModuleManager, mm_module_manager, G_TYPE_OBJECT); -struct _MMModuleManagerDetails { +struct _MMModuleManagerPrivate { GList *modules; char *path; }; @@ -40,7 +40,7 @@ struct _MMModuleManagerDetails { static void load_modules (MMModuleManager *manager) { - MMModuleManagerDetails *details = manager->details; + MMModuleManagerPrivate *details = manager->details; GDir *dir; GError *error = NULL; @@ -86,7 +86,7 @@ mm_module_manager_finalize (GObject *o) static void mm_module_manager_init (MMModuleManager *manager) { - MMModuleManagerDetails *details = manager->details = + MMModuleManagerPrivate *details = manager->details = MM_MODULE_MANAGER_GET_PRIVATE (manager); details->path = g_strdup (MMEDIAMANAGER_EXTENSIONDIR); @@ -99,7 +99,7 @@ mm_module_manager_class_init (MMModuleManagerClass *klass) { G_OBJECT_CLASS (klass)->finalize = mm_module_manager_finalize; - g_type_class_add_private (klass, sizeof (MMModuleManagerDetails)); + g_type_class_add_private (klass, sizeof (MMModuleManagerPrivate)); } static MMModule * diff --git a/libmmanager/mm-module-manager.h b/libmmanager/mm-module-manager.h index 6f9850e..d965625 100644 --- a/libmmanager/mm-module-manager.h +++ b/libmmanager/mm-module-manager.h @@ -54,12 +54,12 @@ */ typedef struct _MMModuleManager MMModuleManager; -typedef struct _MMModuleManagerDetails MMModuleManagerDetails; +typedef struct _MMModuleManagerPrivate MMModuleManagerPrivate; typedef struct _MMModuleManagerClass MMModuleManagerClass; struct _MMModuleManager { GObject parent_object; - MMModuleManagerDetails *details; + MMModuleManagerPrivate *details; }; struct _MMModuleManagerClass { diff --git a/libmmanager/mm-module.c b/libmmanager/mm-module.c index b49b6b3..d65bc66 100644 --- a/libmmanager/mm-module.c +++ b/libmmanager/mm-module.c @@ -27,11 +27,11 @@ #include "mm-module.h" #define MM_MODULE_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_MODULE, MMModuleDetails)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_MODULE, MMModulePrivate)) G_DEFINE_TYPE (MMModule, mm_module, G_TYPE_TYPE_MODULE); -struct _MMModuleDetails { +struct _MMModulePrivate { /* library objects */ char *filename; GModule *library; @@ -67,13 +67,13 @@ mm_module_class_init (MMModuleClass *klass) type_module_class->unload = mm_module_unload; G_OBJECT_CLASS (klass)->finalize = mm_module_finalize; - g_type_class_add_private (klass, sizeof (MMModuleDetails)); + g_type_class_add_private (klass, sizeof (MMModulePrivate)); } static void mm_module_init (MMModule *module) { - MMModuleDetails *details = module->details = MM_MODULE_GET_PRIVATE (module); + MMModulePrivate *details = module->details = MM_MODULE_GET_PRIVATE (module); details->filename = NULL; details->library = NULL; @@ -84,7 +84,7 @@ static gboolean mm_module_load (GTypeModule *gtm) { MMModule *module = MM_MODULE (gtm); - MMModuleDetails *details = module->details; + MMModulePrivate *details = module->details; gpointer m_initialize, m_shutdown, m_get_types, m_get_name; details->library = g_module_open (details->filename, @@ -152,7 +152,7 @@ mm_module_add_types (MMModule *module, GType *types) * types[1] implements MMCategoryProvider * types[2] implements MMHitCollectionProvider */ - MMModuleDetails *details = module->details; + MMModulePrivate *details = module->details; details->app_provider = MM_APPLICATION_PROVIDER (mm_module_create_provider (module, types[0])); diff --git a/libmmanager/mm-module.h b/libmmanager/mm-module.h index e9e3db8..0c37571 100644 --- a/libmmanager/mm-module.h +++ b/libmmanager/mm-module.h @@ -48,7 +48,7 @@ */ typedef struct _MMModule MMModule; -typedef struct _MMModuleDetails MMModuleDetails; +typedef struct _MMModulePrivate MMModulePrivate; typedef struct _MMModuleClass MMModuleClass; /** @@ -64,7 +64,7 @@ typedef struct _MMModuleClass MMModuleClass; struct _MMModule { GTypeModule parent; - MMModuleDetails *details; + MMModulePrivate *details; /* module symbols here */ void (* initialize) (GTypeModule *module); -- 2.11.4.GIT