[gnome-software] Use G_DEFINE_TYPE_WITH_PRIVATE for GsShell
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Use G_DEFINE_TYPE_WITH_PRIVATE for GsShell
- Date: Thu, 27 Mar 2014 10:19:04 +0000 (UTC)
commit 8e2eafb2ca4a1eb074072b646325ccb6f134c3c6
Author: Kalev Lember <kalevlember gmail com>
Date: Thu Mar 27 10:48:35 2014 +0100
Use G_DEFINE_TYPE_WITH_PRIVATE for GsShell
src/gs-shell.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/gs-shell.c b/src/gs-shell.c
index a906951..a02122b 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -47,8 +47,6 @@ static const gchar *page_name[] = {
static void gs_shell_finalize (GObject *object);
-#define GS_SHELL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_SHELL, GsShellPrivate))
-
typedef struct {
GsShellMode mode;
GtkWidget *focus;
@@ -72,7 +70,7 @@ struct GsShellPrivate
GSList *back_entry_stack;
};
-G_DEFINE_TYPE (GsShell, gs_shell, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GsShell, gs_shell, G_TYPE_OBJECT)
enum {
SIGNAL_LOADED,
@@ -723,8 +721,6 @@ gs_shell_class_init (GsShellClass *klass)
G_STRUCT_OFFSET (GsShellClass, loaded),
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
-
- g_type_class_add_private (klass, sizeof (GsShellPrivate));
}
/**
@@ -733,7 +729,7 @@ gs_shell_class_init (GsShellClass *klass)
static void
gs_shell_init (GsShell *shell)
{
- shell->priv = GS_SHELL_GET_PRIVATE (shell);
+ shell->priv = gs_shell_get_instance_private (shell);
shell->priv->shell_overview = gs_shell_overview_new ();
shell->priv->shell_updates = gs_shell_updates_new ();
shell->priv->shell_installed = gs_shell_installed_new ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]