diff options
Diffstat (limited to 'drivemount')
| -rw-r--r-- | drivemount/drive-button.c | 25 | ||||
| -rw-r--r-- | drivemount/drive-list.c | 17 |
2 files changed, 0 insertions, 42 deletions
diff --git a/drivemount/drive-button.c b/drivemount/drive-button.c index be8b4fa5..51f13c1c 100644 --- a/drivemount/drive-button.c +++ b/drivemount/drive-button.c @@ -53,11 +53,7 @@ static void drive_button_set_mount (DriveButton *self, static void drive_button_reset_popup (DriveButton *self); static void drive_button_ensure_popup (DriveButton *self); -#if GTK_CHECK_VERSION (3, 0, 0) static void drive_button_dispose (GObject *object); -#else -static void drive_button_destroy (GtkObject *object); -#endif #if 0 static void drive_button_unrealize (GtkWidget *widget); #endif /* 0 */ @@ -71,11 +67,7 @@ static void drive_button_theme_change (GtkIconTheme *icon_theme, static void drive_button_class_init (DriveButtonClass *class) { -#if GTK_CHECK_VERSION (3, 0, 0) G_OBJECT_CLASS(class)->dispose = drive_button_dispose; -#else - GTK_OBJECT_CLASS(class)->destroy = drive_button_destroy; -#endif GTK_WIDGET_CLASS(class)->button_press_event = drive_button_button_press; GTK_WIDGET_CLASS(class)->key_press_event = drive_button_key_press; @@ -142,11 +134,7 @@ drive_button_new_from_mount (GMount *mount) } static void -#if GTK_CHECK_VERSION (3, 0, 0) drive_button_dispose (GObject *object) -#else -drive_button_destroy (GtkObject *object) -#endif { DriveButton *self = DRIVE_BUTTON (object); @@ -158,13 +146,8 @@ drive_button_destroy (GtkObject *object) drive_button_reset_popup (self); -#if GTK_CHECK_VERSION (3, 0, 0) if (G_OBJECT_CLASS (drive_button_parent_class)->dispose) (* G_OBJECT_CLASS (drive_button_parent_class)->dispose) (object); -#else - if (GTK_OBJECT_CLASS (drive_button_parent_class)->destroy) - (* GTK_OBJECT_CLASS (drive_button_parent_class)->destroy) (object); -#endif } #if 0 @@ -476,11 +459,7 @@ static void drive_button_reset_popup (DriveButton *self) { if (self->popup_menu) -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_destroy (GTK_WIDGET (self->popup_menu)); -#else - gtk_object_destroy (GTK_OBJECT (self->popup_menu)); -#endif self->popup_menu = NULL; } @@ -623,11 +602,7 @@ open_drive (DriveButton *self, GtkWidget *item) else gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "Could not find Caja", NULL); g_signal_connect (dialog, "response", -#if GTK_CHECK_VERSION (3, 0, 0) G_CALLBACK (gtk_widget_destroy), NULL); -#else - G_CALLBACK (gtk_object_destroy), NULL); -#endif gtk_widget_show (dialog); g_error_free (error); } diff --git a/drivemount/drive-list.c b/drivemount/drive-list.c index 26163160..e249482f 100644 --- a/drivemount/drive-list.c +++ b/drivemount/drive-list.c @@ -35,11 +35,7 @@ G_DEFINE_TYPE (DriveList, drive_list, GTK_TYPE_TABLE); static GVolumeMonitor *volume_monitor = NULL; static void drive_list_finalize (GObject *object); -#if GTK_CHECK_VERSION (3, 0, 0) static void drive_list_dispose (GObject *object); -#else -static void drive_list_destroy (GtkObject *object); -#endif static void drive_list_add (GtkContainer *container, GtkWidget *child); static void drive_list_remove (GtkContainer *container, GtkWidget *child); @@ -74,11 +70,7 @@ static void drive_list_class_init (DriveListClass *class) { G_OBJECT_CLASS (class)->finalize = drive_list_finalize; -#if GTK_CHECK_VERSION (3, 0, 0) G_OBJECT_CLASS (class)->dispose = drive_list_dispose; -#else - GTK_OBJECT_CLASS (class)->destroy = drive_list_destroy; -#endif GTK_CONTAINER_CLASS (class)->add = drive_list_add; GTK_CONTAINER_CLASS (class)->remove = drive_list_remove; } @@ -152,11 +144,7 @@ drive_list_finalize (GObject *object) } static void -#if GTK_CHECK_VERSION (3, 0, 0) drive_list_dispose (GObject *object) -#else -drive_list_destroy (GtkObject *object) -#endif { DriveList *self = DRIVE_LIST (object); @@ -177,13 +165,8 @@ drive_list_destroy (GtkObject *object) g_source_remove (self->layout_tag); self->layout_tag = 0; -#if GTK_CHECK_VERSION (3, 0, 0) if (G_OBJECT_CLASS (drive_list_parent_class)->dispose) (* G_OBJECT_CLASS (drive_list_parent_class)->dispose) (object); -#else - if (GTK_OBJECT_CLASS (drive_list_parent_class)->destroy) - (* GTK_OBJECT_CLASS (drive_list_parent_class)->destroy) (object); -#endif } static void |