From 336743475664829a64d13bbd70a2c97a58375d0c Mon Sep 17 00:00:00 2001 From: monsta Date: Sun, 28 Jan 2018 21:33:09 +0300 Subject: require GTK+ 3.22 and GLib 2.50 --- plugins/housekeeping/msd-disk-space.c | 5 ----- plugins/housekeeping/msd-ldsm-dialog.c | 8 -------- plugins/housekeeping/msd-ldsm-trash-empty.c | 16 ---------------- 3 files changed, 29 deletions(-) (limited to 'plugins/housekeeping') diff --git a/plugins/housekeeping/msd-disk-space.c b/plugins/housekeeping/msd-disk-space.c index 3aa1ab7..505d6ab 100644 --- a/plugins/housekeeping/msd-disk-space.c +++ b/plugins/housekeeping/msd-disk-space.c @@ -659,12 +659,7 @@ msd_ldsm_setup (gboolean check_now) msd_ldsm_get_config (); g_signal_connect (settings, "changed", G_CALLBACK (msd_ldsm_update_config), NULL); -#if GLIB_CHECK_VERSION (2, 44, 0) ldsm_monitor = g_unix_mount_monitor_get (); -#else - ldsm_monitor = g_unix_mount_monitor_new (); - g_unix_mount_monitor_set_rate_limit (ldsm_monitor, 1000); -#endif g_signal_connect (ldsm_monitor, "mounts-changed", G_CALLBACK (ldsm_mounts_changed), NULL); diff --git a/plugins/housekeeping/msd-ldsm-dialog.c b/plugins/housekeeping/msd-ldsm-dialog.c index 8a01bca..d9b5cd5 100644 --- a/plugins/housekeeping/msd-ldsm-dialog.c +++ b/plugins/housekeeping/msd-ldsm-dialog.c @@ -223,23 +223,15 @@ msd_ldsm_dialog_init (MsdLdsmDialog *dialog) gtk_label_set_line_wrap (GTK_LABEL (dialog->priv->primary_label), TRUE); gtk_label_set_single_line_mode (GTK_LABEL (dialog->priv->primary_label), FALSE); gtk_label_set_max_width_chars (GTK_LABEL (dialog->priv->primary_label), 70); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (dialog->priv->primary_label), 0.0); gtk_label_set_yalign (GTK_LABEL (dialog->priv->primary_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (dialog->priv->primary_label), 0.0, 0.0); -#endif dialog->priv->secondary_label = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (dialog->priv->secondary_label), TRUE); gtk_label_set_single_line_mode (GTK_LABEL (dialog->priv->secondary_label), FALSE); gtk_label_set_max_width_chars (GTK_LABEL (dialog->priv->secondary_label), 70); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (dialog->priv->secondary_label), 0.0); gtk_label_set_yalign (GTK_LABEL (dialog->priv->secondary_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (dialog->priv->secondary_label), 0.0, 0.0); -#endif /* Create the check button to ignore future warnings */ dialog->priv->ignore_check_button = gtk_check_button_new (); diff --git a/plugins/housekeeping/msd-ldsm-trash-empty.c b/plugins/housekeeping/msd-ldsm-trash-empty.c index c552c3b..d126b83 100644 --- a/plugins/housekeeping/msd-ldsm-trash-empty.c +++ b/plugins/housekeeping/msd-ldsm-trash-empty.c @@ -252,40 +252,24 @@ trash_empty_start () label1 = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (label1), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label1), 0.0); gtk_label_set_yalign (GTK_LABEL (label1), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (label1), 0.0, 0.5); -#endif label3 = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (label3), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label3), 0.0); gtk_label_set_yalign (GTK_LABEL (label3), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (label3), 0.0, 0.5); -#endif gtk_widget_hide (label3); location_label = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (location_label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (location_label), 0.0); gtk_label_set_yalign (GTK_LABEL (location_label), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (location_label), 0.0, 0.5); -#endif file_label = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (file_label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (file_label), 0.0); gtk_label_set_yalign (GTK_LABEL (file_label), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (file_label), 0.0, 0.5); -#endif progressbar = gtk_progress_bar_new (); gtk_progress_bar_set_pulse_step (GTK_PROGRESS_BAR (progressbar), 0.1); -- cgit v1.2.1