diff options
Diffstat (limited to 'trashapplet/src')
| -rw-r--r-- | trashapplet/src/trash-empty.c | 12 | ||||
| -rw-r--r-- | trashapplet/src/trashapplet.c | 20 | 
2 files changed, 0 insertions, 32 deletions
| diff --git a/trashapplet/src/trash-empty.c b/trashapplet/src/trash-empty.c index 18a1260a..6505e50c 100644 --- a/trashapplet/src/trash-empty.c +++ b/trashapplet/src/trash-empty.c @@ -125,11 +125,7 @@ trash_empty_update_dialog (gpointer user_data)  static gboolean  trash_empty_done (gpointer user_data)  { -#if GTK_CHECK_VERSION (3, 0, 0)    gtk_widget_destroy (GTK_WIDGET (trash_empty_dialog)); -#else -  gtk_object_destroy (GTK_OBJECT (trash_empty_dialog)); -#endif    g_assert (trash_empty_dialog == NULL); @@ -264,11 +260,7 @@ trash_empty_start (GtkWidget *parent)            g_critical ("failed to parse trash-empty dialog markup");            if (trash_empty_dialog) -#if GTK_CHECK_VERSION (3, 0, 0)              gtk_widget_destroy (GTK_WIDGET (trash_empty_dialog)); -#else -            gtk_object_destroy (GTK_OBJECT (trash_empty_dialog)); -#endif            g_object_unref (builder);            return; @@ -310,11 +302,7 @@ trash_empty_confirmation_response (GtkDialog *dialog,    if (response_id == GTK_RESPONSE_YES)      trash_empty_start (GTK_WIDGET (dialog)); -#if GTK_CHECK_VERSION (3, 0, 0)    gtk_widget_destroy (GTK_WIDGET (dialog)); -#else -  gtk_object_destroy (GTK_OBJECT (dialog)); -#endif    g_assert (trash_empty_confirm_dialog == NULL);  } diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c index 709e9d3b..be92ca9d 100644 --- a/trashapplet/src/trashapplet.c +++ b/trashapplet/src/trashapplet.c @@ -188,11 +188,7 @@ trash_applet_size_allocate (GtkWidget    *widget,  }  static void -#if GTK_CHECK_VERSION (3, 0, 0)  trash_applet_dispose (GObject *object) -#else -trash_applet_destroy (GtkObject *object) -#endif  {    TrashApplet *applet = TRASH_APPLET (object); @@ -212,11 +208,7 @@ trash_applet_destroy (GtkObject *object)      g_object_unref (applet->icon);    applet->icon = NULL; -#if GTK_CHECK_VERSION (3, 0, 0)    G_OBJECT_CLASS (trash_applet_parent_class)->dispose (object); -#else -  GTK_OBJECT_CLASS (trash_applet_parent_class)->destroy (object); -#endif  }  static void @@ -530,11 +522,7 @@ confirm_delete_immediately (GtkWidget *parent_view,    response = gtk_dialog_run (GTK_DIALOG (dialog)); -#if GTK_CHECK_VERSION (3, 0, 0)    gtk_widget_destroy (GTK_WIDGET (dialog)); -#else -  gtk_object_destroy (GTK_OBJECT (dialog)); -#endif    return response == GTK_RESPONSE_YES;  } @@ -609,18 +597,10 @@ trash_applet_drag_data_received (GtkWidget        *widget,  static void  trash_applet_class_init (TrashAppletClass *class)  { -#if GTK_CHECK_VERSION (3, 0, 0)    GObjectClass *gobject_class = G_OBJECT_CLASS (class); -#else -  GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (class); -#endif    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); -#if GTK_CHECK_VERSION (3, 0, 0)    gobject_class->dispose = trash_applet_dispose; -#else -  gtkobject_class->destroy = trash_applet_destroy; -#endif    widget_class->size_allocate = trash_applet_size_allocate;    widget_class->button_release_event = trash_applet_button_release;    widget_class->key_press_event = trash_applet_key_press; | 
