Index: libxfcegui4/netk-window.c =================================================================== --- libxfcegui4/netk-window.c (revision 22566) +++ libxfcegui4/netk-window.c (working copy) @@ -43,6 +43,8 @@ #define FALLBACK_NAME "??" #define ALL_WORKSPACES (0xFFFFFFFF) +#define NETK_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NETK_TYPE_WINDOW, NetkWindowPrivate)) + static GHashTable *window_hash = NULL; /* Keep 0-10 in sync with the numbers in the WindowState enum. Yeah I'm @@ -178,7 +180,7 @@ static NetkWindow *find_last_transient_for (GList * windows, Window xwindow); -static gpointer parent_class; +static GObjectClass *parent_class; static guint signals[LAST_SIGNAL] = { 0 }; GType @@ -214,8 +216,8 @@ static void netk_window_init (NetkWindow * window) { - window->priv = g_new0 (NetkWindowPrivate, 1); - + window->priv = NETK_WINDOW_GET_PRIVATE (window); + window->priv->name = g_strdup (FALLBACK_NAME);; window->priv->icon_name = NULL; window->priv->client_machine = NULL; @@ -228,6 +230,8 @@ netk_window_class_init (NetkWindowClass * klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (NetkWindowPrivate)); parent_class = g_type_class_peek_parent (klass); @@ -302,8 +306,6 @@ if (window->priv->app) g_object_unref (G_OBJECT (window->priv->app)); - g_free (window->priv); - G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -1373,8 +1375,10 @@ if (class_group) g_object_ref (G_OBJECT (class_group)); + if (window->priv->class_group) g_object_unref (G_OBJECT (window->priv->class_group)); + window->priv->class_group = class_group; } Index: libxfcegui4/netk-window-action-menu.c =================================================================== --- libxfcegui4/netk-window-action-menu.c (revision 22566) +++ libxfcegui4/netk-window-action-menu.c (working copy) @@ -405,7 +405,7 @@ amd->window = window; menu = gtk_menu_new (); - g_object_ref (menu); + g_object_ref (G_OBJECT (menu)); gtk_object_sink (GTK_OBJECT (menu)); amd->menu = menu; Index: libxfcegui4/netk-xutils.c =================================================================== --- libxfcegui4/netk-xutils.c (revision 22566) +++ libxfcegui4/netk-xutils.c (working copy) @@ -1832,7 +1832,7 @@ gdk_pixbuf_copy_area (src, 0, 0, w, h, tmp, (size - w) / 2, (size - h) / 2); - g_object_unref (src); + g_object_unref (G_OBJECT (src)); src = tmp; } } Index: libxfcegui4/netk-pager.c =================================================================== --- libxfcegui4/netk-pager.c (revision 22566) +++ libxfcegui4/netk-pager.c (working copy) @@ -37,6 +37,8 @@ #define N_SCREEN_CONNECTIONS 11 +#define NETK_PAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NETK_TYPE_PAGER, NetkPagerPrivate)) + struct _NetkPagerPrivate { NetkScreen *screen; @@ -110,7 +112,7 @@ static GdkPixbuf *netk_pager_get_background (NetkPager * pager, int width, int height); -static gpointer parent_class; +static GObjectClass *parent_class; GType netk_pager_get_type (void) @@ -145,8 +147,8 @@ static void netk_pager_init (NetkPager * pager) { - pager->priv = g_new0 (NetkPagerPrivate, 1); - + pager->priv = NETK_PAGER_GET_PRIVATE (pager); + pager->priv->n_rows = 1; pager->priv->display_mode = NETK_PAGER_DISPLAY_CONTENT; pager->priv->show_all_workspaces = TRUE; @@ -164,6 +166,8 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + g_type_class_add_private (klass, sizeof (NetkPagerPrivate)); parent_class = g_type_class_peek_parent (klass); @@ -196,8 +200,6 @@ pager->priv->bg_cache = NULL; } - g_free (pager->priv); - G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -344,7 +346,7 @@ other_dimension_size = MAX (other_dimension_size, w); } - g_object_unref (layout); + g_object_unref (G_OBJECT (layout)); other_dimension_size += 2; } @@ -926,7 +928,7 @@ rect->x + (rect->width - w) / 2, rect->y + (rect->height - h) / 2, layout); - g_object_unref (layout); + g_object_unref (G_OBJECT (layout)); } } Index: libxfcegui4/netk-tasklist.c =================================================================== --- libxfcegui4/netk-tasklist.c (revision 22566) +++ libxfcegui4/netk-tasklist.c (working copy) @@ -48,6 +48,8 @@ #define NETK_IS_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NETK_TYPE_TASK)) #define NETK_TASK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NETK_TYPE_TASK, NetkTaskClass)) +#define NETK_TASKLIST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NETK_TYPE_TASKLIST, NetkTasklistPrivate)) + typedef struct _NetkTask NetkTask; typedef struct _NetkTaskClass NetkTaskClass; @@ -228,8 +230,8 @@ NetkScreen * screen); static void netk_tasklist_disconnect_screen (NetkTasklist * tasklist); -static gpointer task_parent_class; -static gpointer tasklist_parent_class; +static GObjectClass *task_parent_class; +static GObjectClass *tasklist_parent_class; GType netk_task_get_type (void) @@ -264,6 +266,7 @@ static void netk_task_init (NetkTask * task) { + } static void @@ -344,25 +347,25 @@ if (task->menu) { - g_object_unref (task->menu); + gtk_widget_destroy (task->menu); task->menu = NULL; } if (task->action_menu) { - g_object_unref (task->action_menu); + g_object_unref (G_OBJECT (task->action_menu)); task->action_menu = NULL; } if (task->window) { - g_object_unref (task->window); + g_object_unref (G_OBJECT (task->window)); task->window = NULL; } if (task->class_group) { - g_object_unref (task->class_group); + g_object_unref (G_OBJECT (task->class_group)); task->class_group = NULL; } @@ -410,8 +413,8 @@ { GTK_WIDGET_SET_FLAGS (GTK_WIDGET (tasklist), GTK_NO_WINDOW); - tasklist->priv = g_new0 (NetkTasklistPrivate, 1); - + tasklist->priv = NETK_TASKLIST_GET_PRIVATE (tasklist); + tasklist->priv->include_all_workspaces = FALSE; tasklist->priv->win_hash = g_hash_table_new (NULL, NULL); @@ -433,6 +436,8 @@ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass); + g_type_class_add_private (klass, sizeof (NetkTasklistPrivate)); + tasklist_parent_class = g_type_class_peek_parent (klass); object_class->finalize = netk_tasklist_finalize; @@ -479,7 +484,7 @@ if (tasklist->priv->tooltips) { - g_object_unref (tasklist->priv->tooltips); + g_object_unref (G_OBJECT (tasklist->priv->tooltips)); tasklist->priv->tooltips = NULL; } @@ -487,9 +492,6 @@ tasklist->priv->size_hints = NULL; tasklist->priv->size_hints_len = 0; - g_free (tasklist->priv); - tasklist->priv = NULL; - G_OBJECT_CLASS (tasklist_parent_class)->finalize (object); } @@ -1116,7 +1118,7 @@ g_list_remove (tasklist->priv->windows, task); gtk_widget_unparent (widget); - g_object_unref (task); + g_object_unref (G_OBJECT (task)); break; } } @@ -1134,7 +1136,7 @@ g_list_remove (tasklist->priv->class_groups, task); gtk_widget_unparent (widget); - g_object_unref (task); + g_object_unref (G_OBJECT (task)); break; } } @@ -1762,7 +1764,7 @@ gtk_widget_show (image); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image); - g_object_unref (pixbuf); + g_object_unref (G_OBJECT (pixbuf)); } gtk_widget_show (menu_item); @@ -1919,7 +1921,7 @@ } if (orig == pixbuf) - g_object_ref (pixbuf); + g_object_ref (G_OBJECT (pixbuf)); return pixbuf; } @@ -2000,7 +2002,7 @@ pixbuf = netk_task_get_icon (task); gtk_image_set_from_pixbuf (GTK_IMAGE (task->image), pixbuf); if (pixbuf) - g_object_unref (pixbuf); + g_object_unref (G_OBJECT (pixbuf)); text = netk_task_get_text (task); if (text != NULL) @@ -2226,7 +2228,7 @@ if (pixbuf) { task->image = gtk_image_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); + g_object_unref (G_OBJECT (pixbuf)); } else { @@ -2510,8 +2512,8 @@ task = g_object_new (NETK_TYPE_TASK, NULL); task->type = NETK_TASK_WINDOW; - task->window = g_object_ref (window); - task->class_group = g_object_ref (netk_window_get_class_group (window)); + task->window = g_object_ref (G_OBJECT (window)); + task->class_group = g_object_ref (G_OBJECT (netk_window_get_class_group (window))); task->tasklist = tasklist; task->blink_timeout_id = 0; @@ -2534,7 +2536,7 @@ task = g_object_new (NETK_TYPE_TASK, NULL); task->type = NETK_TASK_CLASS_GROUP; - task->class_group = g_object_ref (class_group); + task->class_group = g_object_ref (G_OBJECT (class_group)); task->window = NULL; task->tasklist = tasklist; task->blink_timeout_id = 0; Index: libxfcegui4/netk-class-group.c =================================================================== --- libxfcegui4/netk-class-group.c (revision 22566) +++ libxfcegui4/netk-class-group.c (working copy) @@ -24,6 +24,7 @@ #include "netk-window.h" #include "netk-private.h" +#define NETK_CLASS_GROUP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NETK_TYPE_CLASS_GROUP, NetkClassGroupPrivate)) /* Private part of the NetkClassGroup structure */ struct _NetkClassGroupPrivate @@ -57,7 +58,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; -static gpointer *parent_class; +static GObjectClass *parent_class; GType @@ -90,11 +91,13 @@ } static void -netk_class_group_class_init (NetkClassGroupClass * class) +netk_class_group_class_init (NetkClassGroupClass * klass) { - GObjectClass *gobject_class = G_OBJECT_CLASS (class); + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (NetkClassGroupPrivate)); - parent_class = g_type_class_peek_parent (class); + parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = netk_class_group_finalize; @@ -115,44 +118,37 @@ static void netk_class_group_init (NetkClassGroup * class_group) { - NetkClassGroupPrivate *priv; + class_group->priv = NETK_CLASS_GROUP_GET_PRIVATE (class_group); + + class_group->priv->res_class = NULL; + class_group->priv->name = NULL; + class_group->priv->windows = NULL; - priv = g_new (NetkClassGroupPrivate, 1); - class_group->priv = priv; - - priv->res_class = NULL; - priv->name = NULL; - priv->windows = NULL; - - priv->icon = NULL; - priv->mini_icon = NULL; + class_group->priv->icon = NULL; + class_group->priv->mini_icon = NULL; } static void netk_class_group_finalize (GObject * object) { NetkClassGroup *class_group; - NetkClassGroupPrivate *priv; class_group = NETK_CLASS_GROUP (object); - priv = class_group->priv; - if (priv->res_class) - g_free (priv->res_class); + if (class_group->priv->res_class) + g_free (class_group->priv->res_class); - if (priv->name) - g_free (priv->name); + if (class_group->priv->name) + g_free (class_group->priv->name); - g_list_free (priv->windows); + g_list_free (class_group->priv->windows); - if (priv->icon) - g_object_unref (priv->icon); + if (class_group->priv->icon) + g_object_unref (G_OBJECT (class_group->priv->icon)); - if (priv->mini_icon) - g_object_unref (priv->mini_icon); + if (class_group->priv->mini_icon) + g_object_unref (G_OBJECT (class_group->priv->mini_icon)); - g_free (priv); - G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -190,7 +186,6 @@ p_netk_class_group_create (const char *res_class) { NetkClassGroup *class_group; - NetkClassGroupPrivate *priv; if (class_group_hash == NULL) class_group_hash = g_hash_table_new (g_str_hash, g_str_equal); @@ -199,11 +194,10 @@ (class_group_hash, res_class ? res_class : "") == NULL, NULL); class_group = g_object_new (NETK_TYPE_CLASS_GROUP, NULL); - priv = class_group->priv; - priv->res_class = g_strdup (res_class ? res_class : ""); + class_group->priv->res_class = g_strdup (res_class ? res_class : ""); - g_hash_table_insert (class_group_hash, priv->res_class, class_group); + g_hash_table_insert (class_group_hash, class_group->priv->res_class, class_group); /* Hash now owns one ref, caller gets none */ return class_group; @@ -218,37 +212,30 @@ void p_netk_class_group_destroy (NetkClassGroup * class_group) { - NetkClassGroupPrivate *priv; - g_return_if_fail (NETK_IS_CLASS_GROUP (class_group)); - priv = class_group->priv; + g_hash_table_remove (class_group_hash, class_group->priv->res_class); - g_hash_table_remove (class_group_hash, priv->res_class); + g_free (class_group->priv->res_class); + class_group->priv->res_class = NULL; - g_free (priv->res_class); - priv->res_class = NULL; - /* remove hash's ref on the class group */ - g_object_unref (class_group); + g_object_unref (G_OBJECT (class_group)); } static const char * get_name_from_applications (NetkClassGroup * class_group) { - NetkClassGroupPrivate *priv; const char *first_name; GList *l; - priv = class_group->priv; - /* Try to get the name from the group leaders. If all have the same name, we * can use that. */ first_name = NULL; - for (l = priv->windows; l; l = l->next) + for (l = class_group->priv->windows; l; l = l->next) { NetkWindow *w; NetkApplication *app; @@ -282,19 +269,16 @@ static const char * get_name_from_windows (NetkClassGroup * class_group) { - NetkClassGroupPrivate *priv; const char *first_name; GList *l; - priv = class_group->priv; - /* Try to get the name from windows, following the same rationale as * get_name_from_applications() */ first_name = NULL; - for (l = priv->windows; l; l = l->next) + for (l = class_group->priv->windows; l; l = l->next) { NetkWindow *window; @@ -323,15 +307,12 @@ static void set_name (NetkClassGroup * class_group) { - NetkClassGroupPrivate *priv; const char *new_name; - priv = class_group->priv; - - if (priv->name) + if (class_group->priv->name) { - g_free (priv->name); - priv->name = NULL; + g_free (class_group->priv->name); + class_group->priv->name = NULL; } new_name = get_name_from_applications (class_group); @@ -341,15 +322,15 @@ new_name = get_name_from_windows (class_group); if (!new_name) - new_name = priv->res_class; + new_name = class_group->priv->res_class; } g_assert (new_name != NULL); - if (!priv->name || g_utf8_collate (priv->name, new_name) != 0) + if (!class_group->priv->name || g_utf8_collate (class_group->priv->name, new_name) != 0) { - g_free (priv->name); - priv->name = g_strdup (new_name); + g_free (class_group->priv->name); + class_group->priv->name = g_strdup (new_name); g_signal_emit (G_OBJECT (class_group), signals[NAME_CHANGED], 0); } @@ -360,15 +341,12 @@ get_icons_from_applications (NetkClassGroup * class_group, GdkPixbuf ** icon, GdkPixbuf ** mini_icon) { - NetkClassGroupPrivate *priv; GList *l; - priv = class_group->priv; - *icon = NULL; *mini_icon = NULL; - for (l = priv->windows; l; l = l->next) + for (l = class_group->priv->windows; l; l = l->next) { NetkWindow *window; NetkApplication *app; @@ -396,15 +374,12 @@ get_icons_from_windows (NetkClassGroup * class_group, GdkPixbuf ** icon, GdkPixbuf ** mini_icon) { - NetkClassGroupPrivate *priv; GList *l; - priv = class_group->priv; - *icon = NULL; *mini_icon = NULL; - for (l = priv->windows; l; l = l->next) + for (l = class_group->priv->windows; l; l = l->next) { NetkWindow *window; @@ -429,11 +404,8 @@ static void set_icon (NetkClassGroup * class_group) { - NetkClassGroupPrivate *priv; GdkPixbuf *icon, *mini_icon; - priv = class_group->priv; - get_icons_from_applications (class_group, &icon, &mini_icon); if (!icon || !mini_icon) @@ -445,14 +417,14 @@ g_assert (icon && mini_icon); - if (priv->icon) - g_object_unref (priv->icon); + if (class_group->priv->icon) + g_object_unref (G_OBJECT (class_group->priv->icon)); - if (priv->mini_icon) - g_object_unref (priv->mini_icon); + if (class_group->priv->mini_icon) + g_object_unref (G_OBJECT (class_group->priv->mini_icon)); - priv->icon = g_object_ref (icon); - priv->mini_icon = g_object_ref (mini_icon); + class_group->priv->icon = g_object_ref (G_OBJECT (icon)); + class_group->priv->mini_icon = g_object_ref (G_OBJECT (mini_icon)); g_signal_emit (G_OBJECT (class_group), signals[ICON_CHANGED], 0); } @@ -469,15 +441,11 @@ p_netk_class_group_add_window (NetkClassGroup * class_group, NetkWindow * window) { - NetkClassGroupPrivate *priv; - g_return_if_fail (NETK_IS_CLASS_GROUP (class_group)); g_return_if_fail (NETK_IS_WINDOW (window)); g_return_if_fail (netk_window_get_class_group (window) == NULL); - priv = class_group->priv; - - priv->windows = g_list_prepend (priv->windows, window); + class_group->priv->windows = g_list_prepend (class_group->priv->windows, window); p_netk_window_set_class_group (window, class_group); set_name (class_group); @@ -500,15 +468,11 @@ p_netk_class_group_remove_window (NetkClassGroup * class_group, NetkWindow * window) { - NetkClassGroupPrivate *priv; - g_return_if_fail (NETK_IS_CLASS_GROUP (class_group)); g_return_if_fail (NETK_IS_WINDOW (window)); g_return_if_fail (netk_window_get_class_group (window) == class_group); - priv = class_group->priv; - - priv->windows = g_list_remove (priv->windows, window); + class_group->priv->windows = g_list_remove (class_group->priv->windows, window); p_netk_window_set_class_group (window, NULL); } @@ -524,12 +488,9 @@ GList * netk_class_group_get_windows (NetkClassGroup * class_group) { - NetkClassGroupPrivate *priv; - g_return_val_if_fail (class_group != NULL, NULL); - priv = class_group->priv; - return priv->windows; + return class_group->priv->windows; } /** @@ -544,12 +505,9 @@ const char * netk_class_group_get_res_class (NetkClassGroup * class_group) { - NetkClassGroupPrivate *priv; - g_return_val_if_fail (class_group != NULL, NULL); - priv = class_group->priv; - return priv->res_class; + return class_group->priv->res_class; } /** @@ -563,13 +521,9 @@ const char * netk_class_group_get_name (NetkClassGroup * class_group) { - NetkClassGroupPrivate *priv; - g_return_val_if_fail (class_group != NULL, NULL); - priv = class_group->priv; - - return priv->name; + return class_group->priv->name; } /** @@ -583,13 +537,9 @@ GdkPixbuf * netk_class_group_get_icon (NetkClassGroup * class_group) { - NetkClassGroupPrivate *priv; - g_return_val_if_fail (class_group != NULL, NULL); - priv = class_group->priv; - - return priv->icon; + return class_group->priv->icon; } /** @@ -603,11 +553,7 @@ GdkPixbuf * netk_class_group_get_mini_icon (NetkClassGroup * class_group) { - NetkClassGroupPrivate *priv; - g_return_val_if_fail (class_group != NULL, NULL); - priv = class_group->priv; - - return priv->mini_icon; + return class_group->priv->mini_icon; } Index: libxfcegui4/netk-workspace.c =================================================================== --- libxfcegui4/netk-workspace.c (revision 22566) +++ libxfcegui4/netk-workspace.c (working copy) @@ -34,6 +34,8 @@ #include "netk-xutils.h" #include "netk-private.h" +#define NETK_WORKSPACE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NETK_TYPE_WORKSPACE, NetkWorkspacePrivate)) + struct _NetkWorkspacePrivate { NetkScreen *screen; @@ -57,7 +59,7 @@ static void emit_name_changed (NetkWorkspace * space); -static gpointer parent_class; +static GObjectClass *parent_class; static guint signals[LAST_SIGNAL] = { 0 }; GType @@ -93,8 +95,8 @@ static void netk_workspace_init (NetkWorkspace * workspace) { - workspace->priv = g_new0 (NetkWorkspacePrivate, 1); - + workspace->priv = NETK_WORKSPACE_GET_PRIVATE (workspace); + workspace->priv->number = -1; } @@ -102,6 +104,8 @@ netk_workspace_class_init (NetkWorkspaceClass * klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (NetkWorkspacePrivate)); parent_class = g_type_class_peek_parent (klass); @@ -123,8 +127,6 @@ g_free (workspace->priv->name); - g_free (workspace->priv); - G_OBJECT_CLASS (parent_class)->finalize (object); } Index: libxfcegui4/netk-application.c =================================================================== --- libxfcegui4/netk-application.c (revision 22566) +++ libxfcegui4/netk-application.c (working copy) @@ -29,6 +29,8 @@ #define FALLBACK_NAME "??" +#define NETK_APPLICATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NETK_TYPE_APPLICATION, NetkApplicationPrivate)) + static GHashTable *app_hash = NULL; struct _NetkApplicationPrivate @@ -72,7 +74,7 @@ static void netk_application_finalize (GObject * object); -static gpointer parent_class; +static GObjectClass *parent_class; static guint signals[LAST_SIGNAL] = { 0 }; GType @@ -108,8 +110,8 @@ static void netk_application_init (NetkApplication * application) { - application->priv = g_new0 (NetkApplicationPrivate, 1); - + application->priv = NETK_APPLICATION_GET_PRIVATE (application); + application->priv->icon_cache = p_netk_icon_cache_new (); p_netk_icon_cache_set_want_fallback (application->priv->icon_cache, FALSE); } @@ -118,6 +120,8 @@ netk_application_class_init (NetkApplicationClass * klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (NetkApplicationPrivate)); parent_class = g_type_class_peek_parent (klass); @@ -155,8 +159,6 @@ g_free (application->priv->name); - g_free (application->priv); - G_OBJECT_CLASS (parent_class)->finalize (object); } Index: libxfcegui4/netk-screen.c =================================================================== --- libxfcegui4/netk-screen.c (revision 22566) +++ libxfcegui4/netk-screen.c (working copy) @@ -50,6 +50,8 @@ #include "netk-xutils.h" #include "netk-private.h" +#define NETK_SCREEN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NETK_TYPE_SCREEN, NetkScreenPrivate)) + static NetkScreen **screens = NULL; struct _NetkScreenPrivate @@ -143,7 +145,7 @@ static void emit_showing_desktop_changed (NetkScreen * screen); static void emit_viewports_changed (NetkScreen * screen); -static gpointer parent_class; +static GObjectClass *parent_class; static guint signals[LAST_SIGNAL] = { 0 }; GType @@ -179,14 +181,15 @@ static void netk_screen_init (NetkScreen * screen) { - screen->priv = g_new0 (NetkScreenPrivate, 1); - + screen->priv = NETK_SCREEN_GET_PRIVATE (screen); } static void netk_screen_class_init (NetkScreenClass * klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (NetkScreenPrivate)); p_netk_init (); @@ -316,8 +319,6 @@ screens[screen->priv->number] = NULL; - g_free (screen->priv); - G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -1116,7 +1117,7 @@ tmp = deleted; while (tmp != NULL) { - g_object_unref (tmp->data); + g_object_unref (G_OBJECT (tmp->data)); tmp = tmp->next; } Index: libxfcegui4/netk-trayicon.c =================================================================== --- libxfcegui4/netk-trayicon.c (revision 22566) +++ libxfcegui4/netk-trayicon.c (working copy) @@ -353,8 +353,8 @@ NetkTrayIcon *icon; icon = NETK_TRAY_ICON (g_object_new (NETK_TYPE_TRAY_ICON, NULL)); - netk_tray_icon_set_screen(icon, xscreen); - g_object_ref(GTK_WIDGET(icon)); + netk_tray_icon_set_screen (icon, xscreen); + g_object_ref (G_OBJECT (icon)); return (GTK_WIDGET (icon)); }