Merge lp:~ev/activity-log-manager/split-out-diagnostics-service into lp:activity-log-manager

[Evan]

This branch removes the code for the whoopsie-preferences DBus service as it now lives in the whoopsie-preferences package (http://bazaar.launchpad.net/~ev/whoopsie-preferences/trunk/files).

See also:
https://bugs.launchpad.net/ubuntu/+source/activity-log-manager/+bug/1203042

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

First, it give a conflict that it cannot delete directory src/diagnostic

Second, even after I manually delete the folder and resolve conflict, distcheck fails because 2 files in po/POTFILES.in still reference the older ui file and C file in diagnostic folder

Please take care of these two issues and make sure that it still works as you expected it to work

review: Needs Fixing (merge-conflict, distcheck)

[lp:~ev/activity-log-manager/split-out-diagnostics-service]

81. By Evan on 2013-07-20

Merge with trunk.

82. By Evan on 2013-07-20

Point at the right locations for whoopsie in the translations.

[Evan (ev)]

I just tried merging it against lp:activity-log-manager locally and it went fine. It'd also show conflicts here if there were some.

I've merged the branch against tip and updated the references in POTFILES.in. make distcheck is now working fine locally.

=== modified file 'configure.ac'
--- configure.ac	2013-07-10 04:22:15 +0000
+++ configure.ac	2013-07-20 20:43:24 +0000
@@ -46,7 +46,7 @@
 PKG_CHECK_MODULES(GEE, gee-1.0, [HAVE_GEE=yes])
 PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0, [HAVE_GIO_UNIX=yes])
 PKG_CHECK_MODULES(POLKIT, polkit-gobject-1, [HAVE_POLKIT=yes], [HAVE_POLKIT=no])
-PKG_CHECK_MODULES(LIBWHOOPSIE, libwhoopsie, [HAVE_LIBWHOOPSIE=yes], [HAVE_LIBWHOOPSIE=no])
+PKG_CHECK_MODULES(LIBWHOOPSIEPREFS, libwhoopsie-preferences, [HAVE_LIBWHOOPSIE=yes], [HAVE_LIBWHOOPSIE=no])
 PKG_CHECK_MODULES(PANTHEON, pantheon, [HAVE_PANTHEON=yes], [HAVE_PANTHEON=no])
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 gobject-2.0)
@@ -89,7 +89,7 @@
    fi
    if test "x$with_whoopsie" != xcheck && test "x$HAVE_LIBWHOOPSIE" != xyes; then
       AC_MSG_FAILURE(
-        [--with-whoopsie was given, but libwhoopsie was not found])
+        [--with-whoopsie was given, but libwhoopsie or libwhoopsie-preferences was not found])
    fi
   ]
 
@@ -103,19 +103,15 @@
 )
 
 AM_CONDITIONAL([HAVE_CCPANEL], [test -n "$CCPANEL_LIBS"  && test "x$with_ccpanel" != xno])
-
-AM_CONDITIONAL([HAVE_WHOOPSIE], [test -n "$POLKIT_LIBS" && test -n "$LIBWHOOPSIE_LIBS"])
-
+AM_CONDITIONAL([HAVE_WHOOPSIE], [test -n "$POLKIT_LIBS" && test -n "$LIBWHOOPSIEPREFS_LIBS"])
 
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
 src/Makefile
-src/diagnostics/Makefile
 po/Makefile.in
 ])
 
-
 if test "x$with_whoopsie" != xno && test "x$HAVE_POLKIT" != xno && test "x$HAVE_LIBWHOOPSIE" != xno; then
   AC_DEFINE([HAVE_WHOOPSIE], 1, [Enable Whoopsie])
   WHOOPSIE_ENABLE=yes

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-06-12 23:31:37 +0000
+++ data/Makefile.am	2013-07-20 20:43:24 +0000
@@ -33,10 +33,15 @@
     switchboard_DATA = alm-switchboard.plug
 endif
 
+if HAVE_WHOOPSIE
+    gnomeccuidir = $(datadir)/gnome-control-center/ui
+    gnomeccui_DATA = whoopsie.ui
+endif
+
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = activity-log-manager.desktop.in gnome-activity-log-manager-panel.desktop.in alm-switchboard.plug
+EXTRA_DIST = activity-log-manager.desktop.in gnome-activity-log-manager-panel.desktop.in alm-switchboard.plug whoopsie.ui
 CLEANFILES = activity-log-manager.desktop gnome-activity-log-manager-panel.desktop 
 
 check: $(desktop_DATA)

=== renamed file 'src/diagnostics/whoopsie.ui' => 'data/whoopsie.ui'
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-07-08 01:37:43 +0000
+++ po/POTFILES.in	2013-07-20 20:43:24 +0000
@@ -9,5 +9,4 @@
 src/unified-privacy-applications.vala
 src/unified-privacy-history.vala
 src/unified-privacy.vala
-src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in
-[type: gettext/glade]src/diagnostics/whoopsie.ui
+[type: gettext/glade]data/whoopsie.ui

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-07-09 01:34:49 +0000
+++ src/Makefile.am	2013-07-20 20:43:24 +0000
@@ -42,6 +42,11 @@
 	$(POLKIT_LIBS) \
 	-lm
 
+if HAVE_WHOOPSIE
+SHARED_LIBS += \
+	$(LIBWHOOPSIEPREFS_LIBS)
+endif
+
 alm_switchboard_SOURCES = \
 	$(SHARED_SOURCES) \
 	alm-plug.vala \
@@ -49,8 +54,7 @@
 
 if HAVE_WHOOPSIE
 alm_switchboard_SOURCES += \
-	diagnostics-widget.c \
-	diagnostics/whoopsie-generated.c
+	diagnostics-widget.c
 endif
 
 if HAVE_SWITCHBOARD
@@ -74,7 +78,6 @@
 AM_VALAFLAGS += \
   -D DIAGNOSTIC
 gnomeccuidir = $(datadir)/gnome-control-center/ui/
-SUBDIRS = diagnostics
 endif
 
 
@@ -103,8 +106,7 @@
 
 if HAVE_WHOOPSIE
 activity_log_manager_SOURCES += \
-	diagnostics-widget.c \
-	diagnostics/whoopsie-generated.c
+	diagnostics-widget.c
 endif
 
 libactivity_log_manager_la_SOURCES = \
@@ -113,8 +115,7 @@
 
 if HAVE_WHOOPSIE
 libactivity_log_manager_la_SOURCES += \
-	diagnostics-widget.c \
-	diagnostics/whoopsie-generated.c
+	diagnostics-widget.c
 endif
 
 
@@ -128,10 +129,6 @@
 	$(SHARED_LIBS) \
 	$(CCPANEL_LIBS)
 
-if HAVE_WHOOPSIE
-libactivity_log_manager_la_LIBADD += \
-	$(POLKIT_LIBS)
-endif
 
 GENERATED_C_FILES = $(SHARED_SOURCES:.vala=.c)
 GENERATED_O_FILES = $(SHARED_SOURCES:.vala=.o)

=== removed directory 'src/diagnostics'
=== modified file 'src/diagnostics-widget.c'
--- src/diagnostics-widget.c	2013-06-20 02:06:00 +0000
+++ src/diagnostics-widget.c	2013-07-20 20:43:24 +0000
@@ -6,7 +6,7 @@
 #define _GNU_SOURCE
 #include <stdio.h>
 
-#include "diagnostics/whoopsie-generated.h"
+#include "whoopsie-preferences/libwhoopsie-preferences.h"
 
 static WhoopsiePreferences* proxy = NULL;
 

=== removed file 'src/diagnostics/Makefile.am'
--- src/diagnostics/Makefile.am	2013-04-16 11:25:34 +0000
+++ src/diagnostics/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-if HAVE_CCPANEL
-ccpaneldir = $(CCPANEL_DIR)
-bin_PROGRAMS = whoopsie-preferences
-endif
-
-policykitdir = $(datadir)/polkit-1/actions/
-dbussystemdir = $(sysconfdir)/dbus-1/system.d/
-dbusservicedir = $(datadir)/dbus-1/system-services/
-gnomeccuidir = $(datadir)/gnome-control-center/ui/
-
-whoopsie_preferences_CFLAGS = \
-	-Wall \
-	-g \
-	$(POLKIT_CFLAGS) $(GIO_UNIX_CFLAGS) \
-	$(LIBWHOOPSIE_CFLAGS)
-
-whoopsie_preferences_SOURCES = \
-	whoopsie-generated.c whoopsie-generated.h whoopsie-preferences.c
-
-whoopsie_preferences_LDADD = \
-	$(POLKIT_LIBS) \
-	$(GIO_UNIX_LIBS) \
-	$(LIBWHOOPSIE_LIBS)
-
-policykit_in_files = com.ubuntu.whoopsiepreferences.policy.in
-
-EXTRA_DIST = \
-	whoopsie-preferences.xml \
-	com.ubuntu.WhoopsiePreferences.service \
-	com.ubuntu.WhoopsiePreferences.conf \
-	$(policykit_in_files) \
-	whoopsie.ui
-
-gnomeccui_DATA = \
-	whoopsie.ui
-policykit_DATA = \
-	$(policykit_in_files:.policy.in=.policy)
-dbussystem_DATA = \
-	com.ubuntu.WhoopsiePreferences.conf
-dbusservice_DATA = \
-	com.ubuntu.WhoopsiePreferences.service
-
-whoopsie-generated.c: whoopsie-preferences.xml
-	gdbus-codegen --interface-prefix com.ubuntu. \
-		--generate-c-code whoopsie-generated \
-		$<
-
-CLEANFILES = whoopsie-generated.[ch] \
-	$(policykit_DATA)
-@INTLTOOL_POLICY_RULE@

=== removed file 'src/diagnostics/com.ubuntu.WhoopsiePreferences.conf'
--- src/diagnostics/com.ubuntu.WhoopsiePreferences.conf	2013-04-16 11:25:34 +0000
+++ src/diagnostics/com.ubuntu.WhoopsiePreferences.conf	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <!-- This configuration file specifies the required security policies
-       for configuring the crash daemon. -->
-
-  <!-- Only root can own the service -->
-  <policy user="root">
-    <allow own="com.ubuntu.WhoopsiePreferences"/>
-  </policy>
-
-  <!-- Allow anyone to invoke methods (further constrained by
-       PolicyKit privileges -->
-  <policy context="default">
-    <allow send_destination="com.ubuntu.WhoopsiePreferences" 
-           send_interface="com.ubuntu.WhoopsiePreferences"/>
-    <allow send_destination="com.ubuntu.WhoopsiePreferences" 
-           send_interface="org.freedesktop.DBus.Introspectable"/>
-    <allow send_destination="com.ubuntu.WhoopsiePreferences" 
-           send_interface="org.freedesktop.DBus.Properties"/>
-  </policy>
-
-</busconfig>
-

=== removed file 'src/diagnostics/com.ubuntu.WhoopsiePreferences.service'
--- src/diagnostics/com.ubuntu.WhoopsiePreferences.service	2013-04-16 11:25:34 +0000
+++ src/diagnostics/com.ubuntu.WhoopsiePreferences.service	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=com.ubuntu.WhoopsiePreferences
-Exec=/usr/bin/whoopsie-preferences
-User=root

=== removed file 'src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in'
--- src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in	2013-04-16 11:25:34 +0000
+++ src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-<policyconfig>
-  <vendor>Ubuntu crash reporting</vendor>
-  <vendor_url>https://launchpad.net/whoopsie</vendor_url>
-  <icon_name>stock_lock</icon_name>
-  <action id="com.ubuntu.whoopsiepreferences.change">
-    <_description>Privacy settings</_description>
-    <_message>To change your privacy settings you need to authenticate.</_message>
-    <defaults>
-      <allow_any>auth_admin</allow_any>
-      <allow_inactive>auth_admin</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
- </action>
-</policyconfig>

=== removed file 'src/diagnostics/whoopsie-preferences.c'
--- src/diagnostics/whoopsie-preferences.c	2013-04-16 11:25:34 +0000
+++ src/diagnostics/whoopsie-preferences.c	1970-01-01 00:00:00 +0000
@@ -1,363 +0,0 @@
-/* whoopsie
- * 
- * Copyright © 2011 Canonical Ltd.
- * Author: Evan Dandrea <[e-mail]>
- * 
- * 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 3 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 <gio/gio.h>
-#include <stdlib.h>
-#include <polkit/polkit.h>
-
-#include "whoopsie-generated.h"
-
-#define CONFIG_PATH "/etc/default/whoopsie"
-
-static GMainLoop* loop = NULL;
-static guint loop_shutdown = 0;
-static GKeyFile* key_file = NULL;
-static PolkitAuthority* authority = NULL;
-
-/* Eventually, it might make sense to move to gsettings with the dconf
- * backend, once it gains PolicyKit support, rather than have a program just
- * to expose an interface to a small configuration file over DBus/PolicyKit.
- * */
-
-/* Once upstart has an interface for disabiling jobs via initctl, we wont need
- * a configuration file anymore */
-
-gboolean
-whoopsie_preferences_load_configuration (void)
-{
-    char* data;
-    gsize data_size;
-    gboolean ret = TRUE;
-    GError* error = NULL;
-
-    if (g_key_file_load_from_file (key_file, CONFIG_PATH,
-                                   G_KEY_FILE_KEEP_COMMENTS, NULL)) {
-        return TRUE;
-    }
-
-    g_key_file_set_boolean (key_file, "General", "report_crashes", TRUE);
-    g_key_file_set_boolean (key_file, "General", "report_metrics", TRUE);
-    data = g_key_file_to_data (key_file, &data_size, &error);
-    if (error) {
-        g_print ("Could not process configuration: %s\n", error->message);
-        ret = FALSE;
-        goto out;
-    }
-    if (!g_file_set_contents (CONFIG_PATH, data, data_size, &error)) {
-        g_print ("Could not write configuration: %s\n", error->message);
-        ret = FALSE;
-        goto out;
-    }
-
-out:
-    if (data)
-        g_free (data);
-    if (error)
-        g_error_free (error);
-    return ret;
-}
-
-static void
-whoopsie_preferences_dbus_notify (WhoopsiePreferences* interface)
-{
-    GError* error = NULL;
-    gboolean report_crashes = FALSE;
-    gboolean report_metrics = FALSE;
-
-    report_crashes = g_key_file_get_boolean (key_file, "General",
-                                             "report_crashes", &error);
-    if (error) {
-        g_warning ("Could not get crashes: %s", error->message);
-        g_error_free (error);
-    }
-
-    error = NULL;
-    report_metrics = g_key_file_get_boolean (key_file, "General",
-                                             "report_metrics", &error);
-    if (error) {
-        g_warning ("Could not get metrics: %s", error->message);
-        g_error_free (error);
-    }
-    whoopsie_preferences_set_report_crashes (interface, report_crashes);
-    whoopsie_preferences_set_report_metrics (interface, report_metrics);
-}
-
-static void
-whoopsie_preferences_file_changed (GFileMonitor *monitor, GFile *file,
-                                   GFile *other_file,
-                                   GFileMonitorEvent event_type,
-                                   gpointer user_data)
-{
-    if (event_type == G_FILE_MONITOR_EVENT_CHANGED) {
-        whoopsie_preferences_load_configuration ();
-        whoopsie_preferences_dbus_notify (user_data);
-    }
-}
-
-void
-whoopsie_preferences_load (WhoopsiePreferences* interface)
-{
-    GError* error = NULL;
-    GFile* fp = NULL;
-    GFileMonitor* file_monitor = NULL;
-
-    fp = g_file_new_for_path (CONFIG_PATH);
-    file_monitor = g_file_monitor_file (fp, G_FILE_MONITOR_NONE,
-                                        NULL, &error);
-    g_signal_connect (file_monitor, "changed",
-                      G_CALLBACK (whoopsie_preferences_file_changed),
-                      interface);
-    if (error) {
-        g_print ("Could not set up file monitor: %s\n", error->message);
-        g_error_free (error);
-    }
-    g_object_unref (fp);
-    
-    key_file = g_key_file_new ();
-    whoopsie_preferences_load_configuration ();
-}
-
-void
-whoopsie_preferences_notify_upstart (gboolean run_whoopsie)
-{
-    GError* error = NULL;
-    char* command[] = { "/sbin/initctl", run_whoopsie ? "start" : "stop", "whoopsie", NULL };
-    if (!g_spawn_sync (NULL, command, NULL, 0, NULL, NULL, NULL, NULL, NULL, &error)) {
-        g_print ("Could not run initctl: %s\n", error->message);
-    }
-}
-
-gboolean
-whoopsie_preferences_changed (WhoopsiePreferences* object, GParamSpec* pspec,
-                              gpointer user_data)
-{
-    WhoopsiePreferencesIface* iface;
-    gboolean saved_value, new_value;
-    GError* error = NULL;
-    char* data;
-    gsize data_size;
-    gboolean crashes = !g_strcmp0(user_data, "report_crashes");
-
-    if (loop_shutdown) {
-        g_source_remove (loop_shutdown);
-        loop_shutdown = 0;
-    }
-    loop_shutdown = g_timeout_add_seconds (60, (GSourceFunc) g_main_loop_quit,
-                                           loop);
-
-    iface = WHOOPSIE_PREFERENCES_GET_IFACE (object);
-    saved_value = g_key_file_get_boolean (key_file, "General", user_data,
-                                            &error);
-    if (error) {
-        g_print ("Could not process configuration: %s\n", error->message);
-    }
-    if (crashes)
-        new_value = iface->get_report_crashes (object);
-    else
-        new_value = iface->get_report_metrics (object);
-
-    if (error || (saved_value != new_value)) {
-        if (error)
-            g_error_free (error);
-        g_key_file_set_boolean (key_file, "General", user_data, new_value);
-        data = g_key_file_to_data (key_file, &data_size, &error);
-        if (error) {
-            g_print ("Could not process configuration: %s\n", error->message);
-            return FALSE;
-        }
-        if (!g_file_set_contents (CONFIG_PATH, data, data_size, &error)) {
-            g_print ("Could not write configuration: %s\n", error->message);
-            return FALSE;
-        }
-    }
-    if (crashes)
-        whoopsie_preferences_notify_upstart (new_value);
-
-    return TRUE;
-}
-
-static gboolean
-whoopsie_preferences_on_set_report_crashes (WhoopsiePreferences* object,
-                                            GDBusMethodInvocation* invocation,
-                                            gboolean report,
-                                            gpointer user_data)
-{
-    whoopsie_preferences_set_report_crashes (object, report);
-    whoopsie_preferences_complete_set_report_crashes (object, invocation);
-    return TRUE;
-}
-
-static gboolean
-whoopsie_preferences_on_set_report_metrics (WhoopsiePreferences* object,
-                                            GDBusMethodInvocation* invocation,
-                                            gboolean report,
-                                            gpointer user_data)
-{
-    whoopsie_preferences_set_report_metrics (object, report);
-    whoopsie_preferences_complete_set_report_metrics (object, invocation);
-    return TRUE;
-}
-
-static gboolean
-whoopsie_preferences_on_get_identifier (WhoopsiePreferences* object,
-                                        GDBusMethodInvocation* invocation)
-{
-    char* identifier = NULL;
-    GError* error = NULL;
-
-    whoopsie_identifier_generate (&identifier, &error);
-    if (error) {
-        g_printerr ("Error getting identifier: %s\n", error->message);
-        g_error_free (error);
-    }
-    whoopsie_preferences_complete_get_identifier (object, invocation, identifier);
-    return TRUE;
-}
-
-static gboolean
-whoopsie_preferences_authorize_method (GDBusInterfaceSkeleton* interface,
-                                       GDBusMethodInvocation* invocation,
-                                       gpointer user_data)
-{
-    PolkitSubject* subject = NULL;
-    PolkitAuthorizationResult* result = NULL;
-    GError* error = NULL;
-    const char* sender = NULL;
-    gboolean ret = FALSE;
-
-    sender = g_dbus_method_invocation_get_sender (invocation);
-    subject = polkit_system_bus_name_new (sender);
-    result = polkit_authority_check_authorization_sync (authority, subject,
-                                    "com.ubuntu.whoopsiepreferences.change",
-                                    NULL,
-                                    POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE,
-                                    NULL, &error);
-    if (result == NULL) {
-        g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
-                           G_DBUS_ERROR_AUTH_FAILED, "Could not authorize: %s",
-                           error->message);
-        g_error_free (error);
-        goto out;
-    }
-    if (!polkit_authorization_result_get_is_authorized (result)) {
-        g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
-                           G_DBUS_ERROR_AUTH_FAILED, "Not authorized.");
-        goto out;
-    }
-    ret = TRUE;
-    out:
-        if (result != NULL)
-            g_object_unref (result);
-        g_object_unref (subject);
-        return ret;
-}
-
-static void
-on_bus_acquired (GDBusConnection* connection, const gchar* name,
-                 gpointer user_data)
-{
-    WhoopsiePreferences* interface;
-    GError* error = NULL;
-
-    interface = whoopsie_preferences_skeleton_new ();
-    if (!g_dbus_interface_skeleton_export (
-                G_DBUS_INTERFACE_SKELETON (interface),
-                connection,
-                "/com/ubuntu/WhoopsiePreferences", &error)) {
-
-        g_print ("Could not export path: %s\n", error->message);
-        g_error_free (error);
-        g_main_loop_quit (loop);
-        return;
-    }
-
-    authority = polkit_authority_get_sync (NULL, &error);
-    if (authority == NULL) {
-        g_print ("Could not get authority: %s\n", error->message);
-        g_error_free (error);
-        g_main_loop_quit (loop);
-        return;
-    }
-    loop_shutdown = g_timeout_add_seconds (60, (GSourceFunc) g_main_loop_quit,
-                                           loop);
-
-    g_signal_connect (interface, "notify::report-crashes",
-                      G_CALLBACK (whoopsie_preferences_changed),
-                      "report_crashes");
-    g_signal_connect (interface, "notify::report-metrics",
-                      G_CALLBACK (whoopsie_preferences_changed),
-                      "report_metrics");
-    g_signal_connect (interface, "handle-set-report-crashes",
-                      G_CALLBACK (whoopsie_preferences_on_set_report_crashes),
-                      NULL);
-    g_signal_connect (interface, "handle-set-report-metrics",
-                      G_CALLBACK (whoopsie_preferences_on_set_report_metrics),
-                      NULL);
-    g_signal_connect (interface, "handle-get-identifier",
-                      G_CALLBACK (whoopsie_preferences_on_get_identifier),
-                      NULL);
-    g_signal_connect (interface, "g-authorize-method", G_CALLBACK
-                      (whoopsie_preferences_authorize_method), authority);
-
-    whoopsie_preferences_load (interface);
-    whoopsie_preferences_dbus_notify (interface);
-}
-
-static void
-on_name_acquired (GDBusConnection* connection, const gchar* name,
-                  gpointer user_data)
-{
-    g_print ("Acquired the name: %s\n", name);
-}
-
-static void
-on_name_lost (GDBusConnection* connection, const gchar* name,
-              gpointer user_data)
-{
-    g_print ("Lost the name: %s\n", name);
-}
-
-int
-main (int argc, char** argv)
-{
-    guint owner_id;
-
-    if (getuid () != 0) {
-        g_print ("This program must be run as root.\n");
-        return 1;
-    }
-
-    g_type_init();
-
-    owner_id = g_bus_own_name (G_BUS_TYPE_SYSTEM,
-                               "com.ubuntu.WhoopsiePreferences",
-                               G_BUS_NAME_OWNER_FLAGS_NONE,
-                               on_bus_acquired,
-                               on_name_acquired,
-                               on_name_lost,
-                               NULL, NULL);
-
-    loop = g_main_loop_new (NULL, FALSE);
-    g_main_loop_run (loop);
-    g_bus_unown_name (owner_id);
-    g_main_loop_unref (loop);
-    if (key_file)
-        g_key_file_free (key_file);
-    return 0;
-}

=== removed file 'src/diagnostics/whoopsie-preferences.xml'
--- src/diagnostics/whoopsie-preferences.xml	2013-04-16 11:25:34 +0000
+++ src/diagnostics/whoopsie-preferences.xml	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<node>
- <interface name="com.ubuntu.WhoopsiePreferences">
-  <property name="ReportCrashes" type="b" access="read" />
-  <property name="ReportMetrics" type="b" access="read" />
-  <method name="SetReportCrashes">
-   <arg direction="in" type="b" name="report" />
-  </method>
-  <method name="SetReportMetrics">
-   <arg direction="in" type="b" name="report" />
-  </method>
-  <method name="GetIdentifier">
-   <arg direction="out" type="s" name="identifier" />
-  </method>
- </interface>
-</node>