diff options
| author | Felix Riemann <[email protected]> | 2013-10-04 12:07:29 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-07-17 21:53:38 +0200 |
| commit | 5a5612ab8ec4fb31464fa35e049a4a3b7cb64393 (patch) | |
| tree | 0eee4a38e9d5f8f5d39beb5132c57a84c50a0e09 /src/eom-window.c | |
| parent | a3c97eb293bfff825c43bd10d5584ae5a20f5495 (diff) | |
| download | eom-5a5612ab8ec4fb31464fa35e049a4a3b7cb64393.tar.bz2 eom-5a5612ab8ec4fb31464fa35e049a4a3b7cb64393.tar.xz | |
Convert to G_DEFINE_TYPE_WITH_PRIVATE part 1
origin commits:
https://gitlab.gnome.org/GNOME/eog/commit/35c3864
https://gitlab.gnome.org/GNOME/eog/commit/842775b
https://gitlab.gnome.org/GNOME/eog/commit/3fe0bd4
https://gitlab.gnome.org/GNOME/eog/commit/2b25632
https://gitlab.gnome.org/GNOME/eog/commit/f0c977d
https://gitlab.gnome.org/GNOME/eog/commit/5cdb1b8
https://gitlab.gnome.org/GNOME/eog/commit/dba0bd4
https://gitlab.gnome.org/GNOME/eog/commit/8e31683
https://gitlab.gnome.org/GNOME/eog/commit/3945bb1
Diffstat (limited to 'src/eom-window.c')
| -rw-r--r-- | src/eom-window.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/eom-window.c b/src/eom-window.c index 787c116..b2a8c94 100644 --- a/src/eom-window.c +++ b/src/eom-window.c @@ -85,11 +85,6 @@ #define MATE_DESKTOP_USE_UNSTABLE_API #include <libmate-desktop/mate-desktop-utils.h> -#define EOM_WINDOW_GET_PRIVATE(object) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_WINDOW, EomWindowPrivate)) - -G_DEFINE_TYPE (EomWindow, eom_window, GTK_TYPE_APPLICATION_WINDOW); - #define EOM_WINDOW_MIN_WIDTH 440 #define EOM_WINDOW_MIN_HEIGHT 350 @@ -199,6 +194,8 @@ struct _EomWindowPrivate { #endif }; +G_DEFINE_TYPE_WITH_PRIVATE (EomWindow, eom_window, GTK_TYPE_APPLICATION_WINDOW); + static void eom_window_cmd_fullscreen (GtkAction *action, gpointer user_data); static void eom_window_run_fullscreen (EomWindow *window, gboolean slideshow); static void eom_window_cmd_slideshow (GtkAction *action, gpointer user_data); @@ -4597,7 +4594,7 @@ eom_window_init (EomWindow *window) screen = gtk_widget_get_screen (GTK_WIDGET (window)); - priv = window->priv = EOM_WINDOW_GET_PRIVATE (window); + priv = window->priv = eom_window_get_instance_private (window); priv->view_settings = g_settings_new (EOM_CONF_VIEW); priv->ui_settings = g_settings_new (EOM_CONF_UI); @@ -5215,8 +5212,6 @@ eom_window_class_init (EomWindowClass *class) NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - - g_type_class_add_private (g_object_class, sizeof (EomWindowPrivate)); } /** |