summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-05-27 16:34:24 +0200
committerinfirit <[email protected]>2014-05-27 16:34:24 +0200
commitc951215db340629ace5b03785b3559a04d72fffb (patch)
tree18aeb69b3031f748448df9841baa0ed5e3160325
parent469b3c47fce9ea13e50a4448064f97cf297452f8 (diff)
downloadmate-control-center-c951215db340629ace5b03785b3559a04d72fffb.tar.bz2
mate-control-center-c951215db340629ace5b03785b3559a04d72fffb.tar.xz
Replace GtkObject with GObject also for gtk2
-rw-r--r--capplets/about-me/e-image-chooser.c4
-rw-r--r--libslab/app-resizer.c15
2 files changed, 0 insertions, 19 deletions
diff --git a/capplets/about-me/e-image-chooser.c b/capplets/about-me/e-image-chooser.c
index 8a404ee8..099b23cd 100644
--- a/capplets/about-me/e-image-chooser.c
+++ b/capplets/about-me/e-image-chooser.c
@@ -66,11 +66,7 @@ static void image_drag_data_received_cb (GtkWidget *widget,
GtkSelectionData *selection_data,
guint info, guint time, EImageChooser *chooser);
-#if GTK_CHECK_VERSION (3, 0, 0)
static GObjectClass *parent_class = NULL;
-#else
-static GtkObjectClass *parent_class = NULL;
-#endif
#define PARENT_TYPE GTK_TYPE_VBOX
enum DndTargetType {
diff --git a/libslab/app-resizer.c b/libslab/app-resizer.c
index f1e34629..a77183b3 100644
--- a/libslab/app-resizer.c
+++ b/libslab/app-resizer.c
@@ -26,10 +26,6 @@
static void app_resizer_class_init (AppResizerClass *);
static void app_resizer_init (AppResizer *);
-#if !GTK_CHECK_VERSION (3, 0, 0)
-static void app_resizer_destroy (GtkObject *);
-#endif
-
static void app_resizer_size_allocate (GtkWidget * resizer, GtkAllocation * allocation);
#if GTK_CHECK_VERSION (3, 0, 0)
static gboolean app_resizer_paint_window (GtkWidget * widget, cairo_t * cr, AppShellData * app_data);
@@ -45,10 +41,6 @@ app_resizer_class_init (AppResizerClass * klass)
{
GtkWidgetClass *widget_class;
-#if !GTK_CHECK_VERSION (3, 0, 0)
- ((GtkObjectClass *) klass)->destroy = app_resizer_destroy;
-#endif
-
widget_class = GTK_WIDGET_CLASS (klass);
widget_class->size_allocate = app_resizer_size_allocate;
}
@@ -306,13 +298,6 @@ app_resizer_new (GtkVBox * child, gint initial_num_columns, gboolean homogeneous
return GTK_WIDGET (widget);
}
-#if !GTK_CHECK_VERSION (3, 0, 0)
-static void
-app_resizer_destroy (GtkObject * obj)
-{
-}
-#endif
-
void
app_resizer_set_vadjustment_value (GtkWidget * widget, gdouble value)
{