housekeeping: Remove support for notification serves w/o actions

gnome-shell's supported this for a long time, and gnome-settings-daemon
is designed to work in gnome-shell, so the check should be unnecessary.

4 files changed, 60 insertions, 664 deletions

diff --git a/plugins/housekeeping/Makefile.am b/plugins/housekeeping/Makefile.am
index 1d215717..3bf8ba77 100644
--- a/plugins/housekeeping/Makefile.am
+++ b/plugins/housekeeping/Makefile.am
@@ -3,8 +3,6 @@ plugin_name = housekeeping
 COMMON_FILES =				\
 	gsd-disk-space.c		\
 	gsd-disk-space.h		\
-	gsd-ldsm-dialog.c		\
-	gsd-ldsm-dialog.h		\
 	gsd-disk-space-helper.h		\
 	gsd-disk-space-helper.c
 
diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c
index 79308628..996d36c6 100644
--- a/plugins/housekeeping/gsd-disk-space.c
+++ b/plugins/housekeeping/gsd-disk-space.c
@@ -35,7 +35,6 @@
 #include <libnotify/notify.h>
 
 #include "gsd-disk-space.h"
-#include "gsd-ldsm-dialog.h"
 #include "gsd-disk-space-helper.h"
 
 #define GIGABYTE                   1024 * 1024 * 1024
@@ -73,7 +72,6 @@ static unsigned int       min_notify_period = 10;
 static GSList            *ignore_paths = NULL;
 static GSettings         *settings = NULL;
 static GSettings         *privacy_settings = NULL;
-static GsdLdsmDialog     *dialog = NULL;
 static NotifyNotification *notification = NULL;
 
 static guint64           *time_read;
@@ -179,28 +177,6 @@ ldsm_analyze_path (const gchar *path)
                         NULL, NULL, NULL, NULL);
 }
 
-static gboolean
-server_has_actions (void)
-{
-        gboolean has;
-        GList   *caps;
-        GList   *l;
-
-        caps = notify_get_server_caps ();
-        if (caps == NULL) {
-                fprintf (stderr, "Failed to receive server caps.\n");
-                return FALSE;
-        }
-
-        l = g_list_find_custom (caps, "actions", (GCompareFunc)strcmp);
-        has = l != NULL;
-
-        g_list_foreach (caps, (GFunc) g_free, NULL);
-        g_list_free (caps);
-
-        return has;
-}
-
 static void
 ignore_callback (NotifyNotification *n,
                  const char         *action)
@@ -584,14 +560,16 @@ ldsm_notify_for_mount (LdsmMountInfo *mount,
 {
         gchar  *name, *program;
         gint64 free_space;
-        gint response;
         gboolean has_trash;
         gboolean has_disk_analyzer;
         gboolean retval = TRUE;
         gchar *path;
+        char *free_space_str;
+        char *summary;
+        char *body;
 
         /* Don't show a notice if one is already displayed */
-        if (dialog != NULL || notification != NULL)
+        if (notification != NULL)
                 return retval;
 
         name = g_unix_mount_guess_name (mount->mount);
@@ -603,111 +581,70 @@ ldsm_notify_for_mount (LdsmMountInfo *mount,
         has_disk_analyzer = (program != NULL);
         g_free (program);
 
-        if (server_has_actions ()) {
-                char *free_space_str;
-                char *summary;
-                char *body;
+        free_space_str = g_format_size (free_space);
 
-                free_space_str = g_format_size (free_space);
-
-                if (multiple_volumes) {
-                        summary = g_strdup_printf (_("Low Disk Space on “%s”"), name);
-                        if (has_trash) {
-                                body = g_strdup_printf (_("The volume “%s” has only %s disk space remaining.  You may free up some space by emptying the trash."),
-                                                        name,
-                                                        free_space_str);
-                        } else {
-                                body = g_strdup_printf (_("The volume “%s” has only %s disk space remaining."),
-                                                        name,
-                                                        free_space_str);
-                        }
+        if (multiple_volumes) {
+                summary = g_strdup_printf (_("Low Disk Space on “%s”"), name);
+                if (has_trash) {
+                        body = g_strdup_printf (_("The volume “%s” has only %s disk space remaining.  You may free up some space by emptying the trash."),
+                                                name,
+                                                free_space_str);
                 } else {
-                        summary = g_strdup (_("Low Disk Space"));
-                        if (has_trash) {
-                                body = g_strdup_printf (_("This computer has only %s disk space remaining.  You may free up some space by emptying the trash."),
-                                                        free_space_str);
-                        } else {
-                                body = g_strdup_printf (_("This computer has only %s disk space remaining."),
-                                                        free_space_str);
-                        }
-                }
-                g_free (free_space_str);
-
-                notification = notify_notification_new (summary, body, "drive-harddisk-symbolic");
-                g_free (summary);
-                g_free (body);
-
-                g_signal_connect (notification,
-                                  "closed",
-                                  G_CALLBACK (on_notification_closed),
-                                  NULL);
-
-                notify_notification_set_app_name (notification, _("Disk space"));
-                notify_notification_set_hint (notification, "transient", g_variant_new_boolean (TRUE));
-                notify_notification_set_urgency (notification, NOTIFY_URGENCY_CRITICAL);
-                notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
-                if (has_disk_analyzer) {
-                        notify_notification_add_action (notification,
-                                                        "examine",
-                                                        _("Examine"),
-                                                        (NotifyActionCallback) examine_callback,
-                                                        g_strdup (path),
-                                                        g_free);
+                        body = g_strdup_printf (_("The volume “%s” has only %s disk space remaining."),
+                                                name,
+                                                free_space_str);
                 }
+        } else {
+                summary = g_strdup (_("Low Disk Space"));
                 if (has_trash) {
-                        notify_notification_add_action (notification,
-                                                        "empty-trash",
-                                                        _("Empty Trash"),
-                                                        (NotifyActionCallback) empty_trash_callback,
-                                                        NULL,
-                                                        NULL);
+                        body = g_strdup_printf (_("This computer has only %s disk space remaining.  You may free up some space by emptying the trash."),
+                                                free_space_str);
+                } else {
+                        body = g_strdup_printf (_("This computer has only %s disk space remaining."),
+                                                free_space_str);
                 }
+        }
+        g_free (free_space_str);
+
+        notification = notify_notification_new (summary, body, "drive-harddisk-symbolic");
+        g_free (summary);
+        g_free (body);
+
+        g_signal_connect (notification,
+                          "closed",
+                          G_CALLBACK (on_notification_closed),
+                          NULL);
+
+        notify_notification_set_app_name (notification, _("Disk space"));
+        notify_notification_set_hint (notification, "transient", g_variant_new_boolean (TRUE));
+        notify_notification_set_urgency (notification, NOTIFY_URGENCY_CRITICAL);
+        notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
+        if (has_disk_analyzer) {
                 notify_notification_add_action (notification,
-                                                "ignore",
-                                                _("Ignore"),
-                                                (NotifyActionCallback) ignore_callback,
+                                                "examine",
+                                                _("Examine"),
+                                                (NotifyActionCallback) examine_callback,
+                                                g_strdup (path),
+                                                g_free);
+        }
+        if (has_trash) {
+                notify_notification_add_action (notification,
+                                                "empty-trash",
+                                                _("Empty Trash"),
+                                                (NotifyActionCallback) empty_trash_callback,
                                                 NULL,
                                                 NULL);
-                notify_notification_set_category (notification, "device");
-
-                if (!notify_notification_show (notification, NULL)) {
-                        g_warning ("failed to send disk space notification\n");
-                }
-
-        } else {
-                dialog = gsd_ldsm_dialog_new (other_usable_volumes,
-                                              multiple_volumes,
-                                              has_disk_analyzer,
-                                              has_trash,
-                                              free_space,
-                                              name,
-                                              path);
-
-                g_object_ref (G_OBJECT (dialog));
-                response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-                gtk_widget_destroy (GTK_WIDGET (dialog));
-                dialog = NULL;
-
-                switch (response) {
-                case GTK_RESPONSE_CANCEL:
-                        retval = FALSE;
-                        break;
-                case GSD_LDSM_DIALOG_RESPONSE_ANALYZE:
-                        retval = FALSE;
-                        ldsm_analyze_path (path);
-                        break;
-                case GSD_LDSM_DIALOG_RESPONSE_EMPTY_TRASH:
-                        retval = TRUE;
-                        gsd_ldsm_show_empty_trash ();
-                        break;
-                case GTK_RESPONSE_NONE:
-                case GTK_RESPONSE_DELETE_EVENT:
-                        retval = TRUE;
-                        break;
-                default:
-                        g_assert_not_reached ();
-                }
+        }
+        notify_notification_add_action (notification,
+                                        "ignore",
+                                        _("Ignore"),
+                                        (NotifyActionCallback) ignore_callback,
+                                        NULL,
+                                        NULL);
+        notify_notification_set_category (notification, "device");
+
+        if (!notify_notification_show (notification, NULL)) {
+                g_warning ("failed to send disk space notification\n");
         }
 
         g_free (name);
@@ -1080,7 +1017,6 @@ gsd_ldsm_clean (void)
         g_clear_object (&ldsm_monitor);
         g_clear_object (&settings);
         g_clear_object (&privacy_settings);
-        g_clear_object (&dialog);
         g_clear_pointer (&notification, notify_notification_close);
         g_slist_free_full (ignore_paths, g_free);
         ignore_paths = NULL;
diff --git a/plugins/housekeeping/gsd-ldsm-dialog.c b/plugins/housekeeping/gsd-ldsm-dialog.c
deleted file mode 100644
index 017ce73c..00000000
--- a/plugins/housekeeping/gsd-ldsm-dialog.c
+++ /dev/null
@@ -1,470 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * gsd-ldsm-dialog.c
- * Copyright (C) Chris Coulson 2009 <chrisccoulson@googlemail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-
-#include "gsd-ldsm-dialog.h"
-
-#define SETTINGS_HOUSEKEEPING_DIR     "org.gnome.settings-daemon.plugins.housekeeping"
-
-enum
-{
-        PROP_0,
-        PROP_OTHER_USABLE_PARTITIONS,
-        PROP_OTHER_PARTITIONS,
-        PROP_HAS_TRASH,
-        PROP_SPACE_REMAINING,
-        PROP_PARTITION_NAME,
-        PROP_MOUNT_PATH
-};
-
-struct GsdLdsmDialogPrivate
-{
-        GtkWidget *primary_label;
-        GtkWidget *secondary_label;
-        GtkWidget *ignore_check_button;
-        gboolean other_usable_partitions;
-        gboolean other_partitions;
-        gboolean has_trash;
-        gint64 space_remaining;
-        gchar *partition_name;
-        gchar *mount_path;
-};
-
-#define GSD_LDSM_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_LDSM_DIALOG, GsdLdsmDialogPrivate))
-
-static void     gsd_ldsm_dialog_class_init  (GsdLdsmDialogClass *klass);
-static void     gsd_ldsm_dialog_init        (GsdLdsmDialog      *dialog);
-
-G_DEFINE_TYPE (GsdLdsmDialog, gsd_ldsm_dialog, GTK_TYPE_DIALOG);
-
-static const gchar*
-gsd_ldsm_dialog_get_checkbutton_text (GsdLdsmDialog *dialog)
-{
-        g_return_val_if_fail (GSD_IS_LDSM_DIALOG (dialog), NULL);
-        
-        if (dialog->priv->other_partitions)
-                return _("Don't show any warnings again for this file system");
-        else
-                return _("Don't show any warnings again");
-}
-
-static gchar*
-gsd_ldsm_dialog_get_primary_text (GsdLdsmDialog *dialog)
-{
-        gchar *primary_text, *free_space;
-	
-        g_return_val_if_fail (GSD_IS_LDSM_DIALOG (dialog), NULL);
-	
-        free_space = g_format_size (dialog->priv->space_remaining);
-	
-        if (dialog->priv->other_partitions) {
-                primary_text = g_strdup_printf (_("The volume \"%s\" has only %s disk space remaining."),
-                                                dialog->priv->partition_name, free_space);
-        } else {
-                primary_text = g_strdup_printf (_("This computer has only %s disk space remaining."),
-                                                free_space);
-        }
-	
-        g_free (free_space);
-	
-        return primary_text;	
-}
-
-static const gchar*
-gsd_ldsm_dialog_get_secondary_text (GsdLdsmDialog *dialog)
-{
-        g_return_val_if_fail (GSD_IS_LDSM_DIALOG (dialog), NULL);
-	
-        if (dialog->priv->other_usable_partitions) {
-                if (dialog->priv->has_trash) {
-                        return _("You can free up disk space by emptying the Trash, removing " \
-                                 "unused programs or files, or moving files to another disk or partition.");
-                } else {
-                        return _("You can free up disk space by removing unused programs or files, " \
-                                 "or by moving files to another disk or partition.");
-                }
-        } else {
-                if (dialog->priv->has_trash) {
-                        return _("You can free up disk space by emptying the Trash, removing unused " \
-                                 "programs or files, or moving files to an external disk.");
-                } else {
-                        return _("You can free up disk space by removing unused programs or files, " \
-                                 "or by moving files to an external disk.");
-                }
-        }
-}
-
-static gint
-ignore_path_compare (gconstpointer a,
-                     gconstpointer b)
-{
-        return g_strcmp0 ((const gchar *)a, (const gchar *)b);
-}
-
-static gboolean
-update_ignore_paths (GSList **ignore_paths,
-                     const gchar *mount_path,
-                     gboolean ignore)
-{
-        GSList *found;
-        gchar *path_to_remove;
-        
-        found = g_slist_find_custom (*ignore_paths, mount_path, (GCompareFunc) ignore_path_compare);
-        
-        if (ignore && (found == NULL)) {
-                *ignore_paths = g_slist_prepend (*ignore_paths, g_strdup (mount_path));
-                return TRUE;
-        }
-        
-        if (!ignore && (found != NULL)) {
-                path_to_remove = found->data;
-                *ignore_paths = g_slist_remove (*ignore_paths, path_to_remove);
-                g_free (path_to_remove);
-                return TRUE;
-        }
-                
-        return FALSE;
-}
-
-static void
-ignore_check_button_toggled_cb (GtkToggleButton *button,
-                                gpointer user_data)
-{
-        GsdLdsmDialog *dialog = (GsdLdsmDialog *)user_data;
-        GSettings *settings;
-        gchar **settings_list;
-        gboolean ignore, updated;
-        gint i;
-        GSList *ignore_paths = NULL;
-
-        settings = g_settings_new (SETTINGS_HOUSEKEEPING_DIR);
-
-        settings_list = g_settings_get_strv (settings, "ignore-paths");
-
-        for (i = 0; i < G_N_ELEMENTS (settings_list); i++) {
-                if (settings_list[i] != NULL)
-                        ignore_paths = g_slist_append (ignore_paths, g_strdup (settings_list[i]));
-        }
-
-        ignore = gtk_toggle_button_get_active (button);
-        updated = update_ignore_paths (&ignore_paths, dialog->priv->mount_path, ignore);
-
-        g_strfreev (settings_list);
-
-        if (updated) {
-                GSList *l;
-                GPtrArray *array = g_ptr_array_new ();
-
-                for (l = ignore_paths; l != NULL; l = l->next)
-                        g_ptr_array_add (array, l->data);
-                g_ptr_array_add (array, NULL);
-
-                if (!g_settings_set_strv (settings, "ignore-paths", (const gchar **) array->pdata)) {
-                        g_warning ("Cannot change ignore preference - failed to commit changes");
-                }
-
-                g_ptr_array_free (array, FALSE);
-        }
-
-        g_slist_foreach (ignore_paths, (GFunc) g_free, NULL);
-        g_slist_free (ignore_paths);
-        g_object_unref (settings);
-}
-
-static void
-gsd_ldsm_dialog_init (GsdLdsmDialog *dialog)
-{
-        GtkWidget *main_vbox, *text_vbox, *hbox;
-        GtkWidget *image;
-	
-        dialog->priv = GSD_LDSM_DIALOG_GET_PRIVATE (dialog);
-        
-        main_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-
-        /* Set up all the window stuff here */
-        gtk_window_set_title (GTK_WINDOW (dialog), _("Low Disk Space"));
-        gtk_window_set_icon_name (GTK_WINDOW (dialog), 
-                                  "dialog-warning");
-        gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-        gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
-        gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE);
-        gtk_window_set_focus_on_map (GTK_WINDOW (dialog), FALSE);
-        gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-
-        /* Create the image */
-        image = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
-        gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
-
-        /* Create the labels */
-        dialog->priv->primary_label = gtk_label_new (NULL);	
-        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_misc_set_alignment (GTK_MISC (dialog->priv->primary_label), 0.0, 0.0);
-        gtk_label_set_max_width_chars (GTK_LABEL (dialog->priv->primary_label), 72);
-
-        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_misc_set_alignment (GTK_MISC (dialog->priv->secondary_label), 0.0, 0.0);
-        gtk_label_set_max_width_chars (GTK_LABEL (dialog->priv->secondary_label), 72);
-
-        /* Create the check button to ignore future warnings */
-        dialog->priv->ignore_check_button = gtk_check_button_new ();
-        /* The button should be inactive if the dialog was just called.
-         * I suppose it could be possible for the user to manually edit the GSettings key between
-         * the mount being checked and the dialog appearing, but I don't think it matters
-         * too much */
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->ignore_check_button), FALSE);
-        g_signal_connect (dialog->priv->ignore_check_button, "toggled",
-                          G_CALLBACK (ignore_check_button_toggled_cb), dialog);
-        
-        /* Now set up the dialog's GtkBox's' */
-        gtk_box_set_spacing (GTK_BOX (main_vbox), 14);
-	
-        hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-        gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
-	
-        text_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-        
-        gtk_box_pack_start (GTK_BOX (text_vbox), dialog->priv->primary_label, FALSE, FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (text_vbox), dialog->priv->secondary_label, TRUE, TRUE, 0);
-        gtk_box_pack_start (GTK_BOX (text_vbox), dialog->priv->ignore_check_button, FALSE, FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (hbox), text_vbox, TRUE, TRUE, 0);	
-        gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
-						
-        /* Set up the action area */
-        gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), 6);
-        gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), 5);
-	
-        gtk_widget_show_all (hbox);
-}
-
-static void
-gsd_ldsm_dialog_finalize (GObject *object)
-{
-        GsdLdsmDialog *self;
-	
-        g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_LDSM_DIALOG (object));
-
-        self = GSD_LDSM_DIALOG (object);
-
-        g_clear_pointer (&self->priv->partition_name, g_free);
-        g_clear_pointer (&self->priv->mount_path, g_free);
-
-        G_OBJECT_CLASS (gsd_ldsm_dialog_parent_class)->finalize (object);
-}
-
-static void
-gsd_ldsm_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-        GsdLdsmDialog *self;
-	
-        g_return_if_fail (GSD_IS_LDSM_DIALOG (object));
-	
-        self = GSD_LDSM_DIALOG (object);
-
-        switch (prop_id)
-        {
-        case PROP_OTHER_USABLE_PARTITIONS:
-                self->priv->other_usable_partitions = g_value_get_boolean (value);
-                break;
-        case PROP_OTHER_PARTITIONS:
-                self->priv->other_partitions = g_value_get_boolean (value);
-                break;
-        case PROP_HAS_TRASH:
-                self->priv->has_trash = g_value_get_boolean (value);
-                break;
-        case PROP_SPACE_REMAINING:
-                self->priv->space_remaining = g_value_get_int64 (value);
-                break;
-        case PROP_PARTITION_NAME:
-                self->priv->partition_name = g_value_dup_string (value);
-                break;
-        case PROP_MOUNT_PATH:
-                self->priv->mount_path = g_value_dup_string (value);
-                break;
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-                break;
-        }
-}
-
-static void
-gsd_ldsm_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-        GsdLdsmDialog *self;
-	
-        g_return_if_fail (GSD_IS_LDSM_DIALOG (object));
-	
-        self = GSD_LDSM_DIALOG (object);
-
-        switch (prop_id)
-        {
-        case PROP_OTHER_USABLE_PARTITIONS:
-                g_value_set_boolean (value, self->priv->other_usable_partitions);
-                break;
-        case PROP_OTHER_PARTITIONS:
-                g_value_set_boolean (value, self->priv->other_partitions);
-                break;
-        case PROP_HAS_TRASH:
-                g_value_set_boolean (value, self->priv->has_trash);
-                break;
-        case PROP_SPACE_REMAINING:
-                g_value_set_int64 (value, self->priv->space_remaining);
-                break;
-        case PROP_PARTITION_NAME:
-                g_value_set_string (value, self->priv->partition_name);
-                break;
-        case PROP_MOUNT_PATH:
-                g_value_set_string (value, self->priv->mount_path);
-                break;
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-                break;
-        }
-}
-
-static void
-gsd_ldsm_dialog_class_init (GsdLdsmDialogClass *klass)
-{
-        GObjectClass* object_class = G_OBJECT_CLASS (klass);
-
-        object_class->finalize = gsd_ldsm_dialog_finalize;
-        object_class->set_property = gsd_ldsm_dialog_set_property;
-        object_class->get_property = gsd_ldsm_dialog_get_property;
-
-        g_object_class_install_property (object_class,
-                                         PROP_OTHER_USABLE_PARTITIONS,
-                                         g_param_spec_boolean ("other-usable-partitions",
-                                                               "other-usable-partitions",
-                                                               "Set to TRUE if there are other usable partitions on the system",
-                                                               FALSE,
-                                                               G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-        g_object_class_install_property (object_class,
-                                         PROP_OTHER_PARTITIONS,
-                                         g_param_spec_boolean ("other-partitions",
-                                                               "other-partitions",
-                                                               "Set to TRUE if there are other partitions on the system",
-                                                               FALSE,
-                                                               G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-        g_object_class_install_property (object_class,
-                                         PROP_HAS_TRASH,
-                                         g_param_spec_boolean ("has-trash",
-                                                               "has-trash",
-                                                               "Set to TRUE if the partition has files in it's trash folder that can be deleted",
-                                                               FALSE,
-                                                               G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-	                                                       	                                                       
-        g_object_class_install_property (object_class,
-                                         PROP_SPACE_REMAINING,
-                                         g_param_spec_int64 ("space-remaining",
-                                                             "space-remaining",
-                                                             "Specify how much space is remaining in bytes",
-                                                             G_MININT64, G_MAXINT64, 0,
-                                                             G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-	                                                   
-        g_object_class_install_property (object_class,
-                                         PROP_PARTITION_NAME,
-                                         g_param_spec_string ("partition-name",
-                                                              "partition-name",
-                                                              "Specify the name of the partition",
-                                                              "Unknown",
-                                                              G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-	                                                      
-        g_object_class_install_property (object_class,
-                                         PROP_MOUNT_PATH,
-                                         g_param_spec_string ("mount-path",
-                                                              "mount-path",
-                                                              "Specify the mount path for the partition",
-                                                              "Unknown",
-                                                              G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-        g_type_class_add_private (klass, sizeof (GsdLdsmDialogPrivate));
-}
-
-GsdLdsmDialog*
-gsd_ldsm_dialog_new (gboolean     other_usable_partitions,
-                     gboolean     other_partitions,
-                     gboolean     display_baobab,
-                     gboolean     display_empty_trash,
-                     gint64       space_remaining,
-                     const gchar *partition_name,
-                     const gchar *mount_path)
-{
-        GsdLdsmDialog *dialog;
-        GtkWidget *button_empty_trash, *button_ignore, *button_analyze;
-        GtkWidget *empty_trash_image, *analyze_image;
-        gchar *primary_text, *primary_text_markup;
-        const gchar *secondary_text, *checkbutton_text;
-	
-        dialog = GSD_LDSM_DIALOG (g_object_new (GSD_TYPE_LDSM_DIALOG,
-                                                "other-usable-partitions", other_usable_partitions,
-                                                "other-partitions", other_partitions,
-                                                "has-trash", display_empty_trash,
-                                                "space-remaining", space_remaining,
-                                                "partition-name", partition_name,
-                                                "mount-path", mount_path,
-                                                NULL));
-	
-        /* Add some buttons */
-        if (dialog->priv->has_trash) {
-                button_empty_trash = gtk_dialog_add_button (GTK_DIALOG (dialog),
-                                                            _("Empty Trash"),
-                                                            GSD_LDSM_DIALOG_RESPONSE_EMPTY_TRASH);
-                empty_trash_image = gtk_image_new_from_icon_name ("edit-clear", GTK_ICON_SIZE_BUTTON);
-                gtk_button_set_image (GTK_BUTTON (button_empty_trash), empty_trash_image);
-        }
-	
-        if (display_baobab) {
-                button_analyze = gtk_dialog_add_button (GTK_DIALOG (dialog),
-                                                        _("Examine…"),
-                                                        GSD_LDSM_DIALOG_RESPONSE_ANALYZE);
-                analyze_image = gtk_image_new_from_icon_name ("baobab", GTK_ICON_SIZE_BUTTON);
-                gtk_button_set_image (GTK_BUTTON (button_analyze), analyze_image);
-        }
-			
-        button_ignore = gtk_dialog_add_button (GTK_DIALOG (dialog), 
-                                               _("Ignore"), 
-                                               GTK_RESPONSE_CANCEL);
-
-        gtk_widget_grab_default (button_ignore);
-	
-        /* Set the label text */	
-        primary_text = gsd_ldsm_dialog_get_primary_text (dialog);
-        primary_text_markup = g_markup_printf_escaped ("<big><b>%s</b></big>", primary_text);
-        gtk_label_set_markup (GTK_LABEL (dialog->priv->primary_label), primary_text_markup);
-
-        secondary_text = gsd_ldsm_dialog_get_secondary_text (dialog);
-        gtk_label_set_text (GTK_LABEL (dialog->priv->secondary_label), secondary_text);
-        
-        checkbutton_text = gsd_ldsm_dialog_get_checkbutton_text (dialog);
-        gtk_button_set_label (GTK_BUTTON (dialog->priv->ignore_check_button), checkbutton_text);
-        
-        g_free (primary_text);
-        g_free (primary_text_markup);
-	
-        return dialog;
-} 
diff --git a/plugins/housekeeping/gsd-ldsm-dialog.h b/plugins/housekeeping/gsd-ldsm-dialog.h
deleted file mode 100644
index bae477a2..00000000
--- a/plugins/housekeeping/gsd-ldsm-dialog.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * gsd-ldsm-dialog.c
- * Copyright (C) Chris Coulson 2009 <chrisccoulson@googlemail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _GSD_LDSM_DIALOG_H_
-#define _GSD_LDSM_DIALOG_H_
-
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GSD_TYPE_LDSM_DIALOG             (gsd_ldsm_dialog_get_type ())
-#define GSD_LDSM_DIALOG(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_LDSM_DIALOG, GsdLdsmDialog))
-#define GSD_LDSM_DIALOG_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_LDSM_DIALOG, GsdLdsmDialogClass))
-#define GSD_IS_LDSM_DIALOG(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_LDSM_DIALOG))
-#define GSD_IS_LDSM_DIALOG_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_LDSM_DIALOG))
-#define GSD_LDSM_DIALOG_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_LDSM_DIALOG, GsdLdsmDialogClass))
-
-enum
-{
-        GSD_LDSM_DIALOG_RESPONSE_EMPTY_TRASH = -20,
-        GSD_LDSM_DIALOG_RESPONSE_ANALYZE = -21
-};
-
-typedef struct GsdLdsmDialogPrivate GsdLdsmDialogPrivate;
-typedef struct _GsdLdsmDialogClass GsdLdsmDialogClass;
-typedef struct _GsdLdsmDialog GsdLdsmDialog;
-
-struct _GsdLdsmDialogClass
-{
-        GtkDialogClass parent_class;
-};
-
-struct _GsdLdsmDialog
-{
-        GtkDialog parent_instance;
-        GsdLdsmDialogPrivate *priv;
-};
-
-GType gsd_ldsm_dialog_get_type (void) G_GNUC_CONST;
-
-GsdLdsmDialog * gsd_ldsm_dialog_new (gboolean other_usable_partitions,
-                                     gboolean other_partitions,
-                                     gboolean display_baobab,
-                                     gboolean display_empty_trash,
-                                     gint64 space_remaining,
-                                     const gchar *partition_name,
-                                     const gchar *mount_path);
-
-G_END_DECLS
-
-#endif /* _GSD_LDSM_DIALOG_H_ */