aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2010-09-28 21:45:17 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-04 16:41:29 +0800
commit23535a4ce054f952aa31012bbbc2fd894ba77ecd (patch)
treed5e1253b2580022134a25d0bfd7c742b6a911ba3 /src
parentb9881f163ef17c95689cd65f5a9311e8759eb774 (diff)
downloadgsoc2013-empathy-23535a4ce054f952aa31012bbbc2fd894ba77ecd.tar
gsoc2013-empathy-23535a4ce054f952aa31012bbbc2fd894ba77ecd.tar.gz
gsoc2013-empathy-23535a4ce054f952aa31012bbbc2fd894ba77ecd.tar.bz2
gsoc2013-empathy-23535a4ce054f952aa31012bbbc2fd894ba77ecd.tar.lz
gsoc2013-empathy-23535a4ce054f952aa31012bbbc2fd894ba77ecd.tar.xz
gsoc2013-empathy-23535a4ce054f952aa31012bbbc2fd894ba77ecd.tar.zst
gsoc2013-empathy-23535a4ce054f952aa31012bbbc2fd894ba77ecd.zip
Stop using GtkObject (#630685)
Diffstat (limited to 'src')
-rw-r--r--src/empathy-sidebar.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/empathy-sidebar.c b/src/empathy-sidebar.c
index 8c979213c..de6878055 100644
--- a/src/empathy-sidebar.c
+++ b/src/empathy-sidebar.c
@@ -75,7 +75,7 @@ G_DEFINE_TYPE (EmpathySidebar, empathy_sidebar, GTK_TYPE_VBOX)
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EMPATHY_TYPE_SIDEBAR, EmpathySidebarPrivate))
static void
-empathy_sidebar_destroy (GtkObject *object)
+empathy_sidebar_destroy (GtkWidget *object)
{
EmpathySidebar *sidebar = EMPATHY_SIDEBAR (object);
@@ -91,7 +91,7 @@ empathy_sidebar_destroy (GtkObject *object)
sidebar->priv->page_model = NULL;
}
- (* GTK_OBJECT_CLASS (empathy_sidebar_parent_class)->destroy) (object);
+ (* GTK_WIDGET_CLASS (empathy_sidebar_parent_class)->destroy) (object);
}
static void
@@ -197,15 +197,13 @@ empathy_sidebar_class_init (EmpathySidebarClass *empathy_sidebar_class)
{
GObjectClass *g_object_class;
GtkWidgetClass *widget_class;
- GtkObjectClass *gtk_object_klass;
g_object_class = G_OBJECT_CLASS (empathy_sidebar_class);
widget_class = GTK_WIDGET_CLASS (empathy_sidebar_class);
- gtk_object_klass = GTK_OBJECT_CLASS (empathy_sidebar_class);
g_type_class_add_private (g_object_class, sizeof (EmpathySidebarPrivate));
- gtk_object_klass->destroy = empathy_sidebar_destroy;
+ widget_class->destroy = empathy_sidebar_destroy;
g_object_class->get_property = empathy_sidebar_get_property;
g_object_class->set_property = empathy_sidebar_set_property;