[eog] EogPreferencesDialog: Convert to G_DEFINE_TYPE_WITH_PRIVATE
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog] EogPreferencesDialog: Convert to G_DEFINE_TYPE_WITH_PRIVATE
- Date: Fri, 4 Oct 2013 13:27:26 +0000 (UTC)
commit afa0dc8683c5129b5a761af6c0aaff404498afd2
Author: Felix Riemann <friemann gnome org>
Date: Fri Oct 4 14:19:05 2013 +0200
EogPreferencesDialog: Convert to G_DEFINE_TYPE_WITH_PRIVATE
src/eog-preferences-dialog.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/src/eog-preferences-dialog.c b/src/eog-preferences-dialog.c
index 565723b..d303a8b 100644
--- a/src/eog-preferences-dialog.c
+++ b/src/eog-preferences-dialog.c
@@ -37,11 +37,6 @@
#include <gtk/gtk.h>
#include <libpeas-gtk/peas-gtk-plugin-manager.h>
-#define EOG_PREFERENCES_DIALOG_GET_PRIVATE(object) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOG_TYPE_PREFERENCES_DIALOG, EogPreferencesDialogPrivate))
-
-G_DEFINE_TYPE (EogPreferencesDialog, eog_preferences_dialog, EOG_TYPE_DIALOG);
-
#define GCONF_OBJECT_KEY "GCONF_KEY"
#define GCONF_OBJECT_VALUE "GCONF_VALUE"
@@ -52,6 +47,8 @@ struct _EogPreferencesDialogPrivate {
static GObject *instance = NULL;
+G_DEFINE_TYPE_WITH_PRIVATE (EogPreferencesDialog, eog_preferences_dialog, EOG_TYPE_DIALOG);
+
static gboolean
pd_string_to_color_mapping (GValue *value,
GVariant *variant,
@@ -292,14 +289,12 @@ eog_preferences_dialog_class_init (EogPreferencesDialogClass *class)
GObjectClass *g_object_class = (GObjectClass *) class;
g_object_class->constructor = eog_preferences_dialog_constructor;
-
- g_type_class_add_private (g_object_class, sizeof (EogPreferencesDialogPrivate));
}
static void
eog_preferences_dialog_init (EogPreferencesDialog *pref_dlg)
{
- pref_dlg->priv = EOG_PREFERENCES_DIALOG_GET_PRIVATE (pref_dlg);
+ pref_dlg->priv = eog_preferences_dialog_get_instance_private (pref_dlg);
}
GObject *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]