Merge lp:~ev/activity-log-manager/add-whoopsie-back into lp:activity-log-manager

[Evan]

This resurrects code for the Diagnostics panel (whoopsie) that appears to have been accidentally deleted in the move from the lp:~activity-log-manager/activity-log-manager/vala branch.

Namely, it brings back src/diagnostics-widget.c, which is not automatically generated code, unlike the rest of the C files that appear in that directory.

I'm working on a debdiff, with these changes incorporated, against 0.9.4-0ubuntu6.1, which is the version in Ubuntu Saucy.

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

It looks good, but still doesn't show up in System Settings.

http://i.imgur.com/xCTk5bR.png

review: Needs Fixing

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

I did some more research and found that in alm-cc.c file, inside function "alm_main_window_panel_init"

the #ifdef section is not being called. I tried fixing that with changing

#ifdef HAVE_WHOOPSIE to
#ifdef WHOOPSIE

and changing in src/Makefile.am

if HAVE_WHOOPSIE
libactivity_log_manager_la_CFLAGS += \
 $(POLKIT_CFLAGS) \
 -DGNOMECC_UI_DIR=\""$(gnomeccuidir)"\"
endif

to
if HAVE_WHOOPSIE
libactivity_log_manager_la_CFLAGS += \
 $(POLKIT_CFLAGS) \
 -DGNOMECC_UI_DIR=\""$(gnomeccuidir)"\" \
 -DWHOOPSIE
endif

Now the section isnide #ifdef is built, but there is a segfault with bt

Program received signal SIGSEGV, Segmentation fault.
0x00007ffff6488c10 in g_type_check_instance_cast () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
(gdb) bt
#0 0x00007ffff6488c10 in g_type_check_instance_cast () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#1 0x00007fffb99244b0 in alm_main_window_panel_init (self=0x5555557b9b40) at alm-cc.c:63
#2 0x00007ffff648795f in g_type_create_instance () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#3 0x00007ffff646c718 in ?? () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#4 0x00007ffff646dce1 in g_object_newv () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#5 0x00007ffff646e4d0 in g_object_new_valist () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#6 0x00007ffff646e804 in g_object_new () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#7 0x000055555555de8c in ?? ()
#8 0x000055555555be47 in ?? ()
#9 0x00007ffff6467620 in g_closure_invoke () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#10 0x00007ffff6478f00 in ?? () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#11 0x00007ffff6480d11 in g_signal_emit_valist () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#12 0x00007ffff6480f92 in g_signal_emit () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#13 0x000055555555ebbb in ?? ()
#14 0x00007ffff646a7a0 in g_cclosure_marshal_VOID__BOXEDv () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#15 0x00007ffff64678e7 in ?? () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#16 0x00007ffff64802df in g_signal_emit_valist () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#17 0x00007ffff6480f92 in g_signal_emit () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#18 0x000055555555ed94 in ?? ()
#19 0x00007ffff76a849c in ?? () from /usr/lib/x86_64-linux-gnu/libgtk-3.so.0
#20 0x00007ffff6467620 in g_closure_invoke () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#21 0x00007ffff6478f00 in ?? () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#22 0x00007ffff6480996 in g_signal_emit_valist () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#23 0x00007ffff6480f92 in g_signal_emit () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#24 0x00007ffff77d777e in ?? () from /usr/lib/x86_64-linux-gnu/libgtk-3.so.0

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

#1 0x00007fffb99244b0 in alm_main_window_panel_init (self=0x5555557b9b40) at alm-cc.c:63
line 63 is
GtkWidget *whoopsie = GTK_WIDGET (whoopsie_daisy_preferences_new ());

tells that the issue is with macro GTK_WIDGET since if the problem was with whoopsie_daisy_preferences_new () then the backtrace would have included the function

GtkWidget*
whoopsie_daisy_preferences_new (void)
{
    return g_object_new (WHOOPSIE_DAISY_TYPE_PREFERENCES, NULL);
}

section from diagnostic-widget.c

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

I tried it in a VM and I did not get any Segfault. Now this is weird. Evan, can you try it out with the above changes I mentioned

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

Sorry, here is the branch where I pushed the minor changes with your merged branch
lp:~manishsinha/activity-log-manager/ev

[lp:~ev/activity-log-manager/add-whoopsie-back]

51. By Evan on 2013-06-18

Tidy

52. By Evan on 2013-06-18

Merge Manish's branch with changes.

[Evan (ev)]

I've implemented the define for whoopsie in a slightly different way. It is working fine for me when I build it in a deb and install that way.

Can you please build with debugging symbols and provide a backtrace?

[Evan (ev)]

I can also confirm this works well with Jeremy's debdiff:

https://bugs.launchpad.net/ubuntu/+source/activity-log-manager/+bug/1189253/+attachment/3699264/+files/update-to-0.9.5.debdiff

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

Hello Evan, I am still getting crashes on another system, with backtrace

Program received signal SIGSEGV, Segmentation fault.
g_type_check_instance_cast (type_instance=0xffffffffe8006e00, iface_type=iface_type@entry=93824994480816) at /build/buildd/glib2.0-2.36.0/./gobject/gtype.c:4027
4027 /build/buildd/glib2.0-2.36.0/./gobject/gtype.c: No such file or directory.
(gdb) bt
#0 g_type_check_instance_cast (type_instance=0xffffffffe8006e00, iface_type=iface_type@entry=93824994480816) at /build/buildd/glib2.0-2.36.0/./gobject/gtype.c:4027
#1 0x00007fffe45f94b0 in alm_main_window_panel_init (self=0x555555b3ab40) at alm-cc.c:63
#2 0x00007ffff648795f in g_type_create_instance (type=<optimized out>) at /build/buildd/glib2.0-2.36.0/./gobject/gtype.c:1917
#3 0x00007ffff646c718 in g_object_constructor (type=<optimized out>, n_construct_properties=1, construct_params=0x555555b78110) at /build/buildd/glib2.0-2.36.0/./gobject/gobject.c:1855
#4 0x00007ffff646dce1 in g_object_newv (object_type=object_type@entry=93824997485168, n_parameters=n_parameters@entry=2, parameters=parameters@entry=0x555555b7dcf0)
    at /build/buildd/glib2.0-2.36.0/./gobject/gobject.c:1719
#5 0x00007ffff646e4d0 in g_object_new_valist (object_type=object_type@entry=93824997485168, first_property_name=first_property_name@entry=0x55555556019b "shell",
    var_args=var_args@entry=0x7fffffffca48) at /build/buildd/glib2.0-2.36.0/./gobject/gobject.c:1836
#6 0x00007ffff646e804 in g_object_new (object_type=93824997485168, first_property_name=0x55555556019b "shell") at /build/buildd/glib2.0-2.36.0/./gobject/gobject.c:1551
#7 0x000055555555de8c in ?? ()
#8 0x000055555555be47 in ?? ()
#9 0x00007ffff6467620 in g_closure_invoke (closure=0x555555931870, return_value=0x0, n_param_values=4, param_values=0x7fffffffce10, invocation_hint=0x7fffffffcdb0)
    at /build/buildd/glib2.0-2.36.0/./gobject/gclosure.c:777
#10 0x00007ffff6478f00 in signal_emit_unlocked_R (node=node@entry=0x555555931b20, detail=detail@entry=0, instance=instance@entry=0x555555a00000, emission_return=emission_return@entry=0x0,
    instance_and_params=instance_and_params@entry=0x7fffffffce10) at /build/buildd/glib2.0-2.36.0/./gobject/gsignal.c:3584
#11 0x00007ffff6480d11 in g_signal_emit_valist (instance=0x555555a00000, signal_id=<optimized out>, detail=0, var_args=var_args@entry=0x7fffffffd098)
    at /build/buildd/glib2.0-2.36.0/./gobject/gsignal.c:3328
#12 0x00007ffff6480f92 in g_signal_emit (instance=<optimized out>, signal_id=<optimized out>, detail=<optimized out>) at /build/buildd/glib2.0-2.36.0/./gobject/gsignal.c:3384
#13 0x000055555555ebbb in ?? ()
#14 0x00007ffff646a7a0 in g_cclosure_marshal_VOID__BOXEDv (closure=0x555555931ff0, return_value=<optimized out>, instance=<optimized out>, args=<optimized out>,
    marshal_data=<optimized out>, n_params=<optimized out>, param_types=0x555555768ea0) at /build/buildd/glib2.0-2.36.0/./gobject/gmarshal.c:1160
#15 0x00007ffff64678e7 in _g_closure_invoke_va (closure=0x555555931ff0, return_value=0x0, instance=0x555555a00000, args=0x7fffffffd518, n_params=1, param_types=0x555555768ea0)
    at /build/buildd/glib2.0-2.36.0/./gobject/gclosure.c:840
#16 0x00007ffff64802df in g_s...

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

Used the debdiff and built the packages locally and installed it. Sadly, crashes again with exactly the same backtrace

[lp:~ev/activity-log-manager/add-whoopsie-back]

53. By Evan on 2013-06-19

Some small cleanups. Debugging.

[Evan (ev)]

So whoopsie_daisy_preferences_new () is returning an invalid type from the looks of it.

Can you please build from my branch with the latest commits (r53) and try again? It should output something like "GType: 258458288" but will probably give you something bogus. Bonus points if you can use gdb to dig at what's going on in whoopsie_daisy_preferences_new ().

As far as I can see we're constructing the type properly, so I'm perplexed as to what's going on here.

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

This fixes it. I guess it was solved by

- extern void* whoopsie_daisy_preferences_new (void);
+ extern GtkWidget* whoopsie_daisy_preferences_new (void);

I will still check it on another developer installation before merging

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2013-04-21 07:25:20 +0000
+++ .bzrignore	2013-06-19 15:17:27 +0000
@@ -28,7 +28,7 @@
 src/activity-log-manager
 src/alm
 src/alm-switchboard
-src/*.c
+RE:src/(?!diagnostics-widget).*.c
 src/*.h
 src/*.la
 src/*.lo
@@ -41,3 +41,6 @@
 po/.intltool-merge-cache
 po/POTFILES
 po/stamp-it
+src/diagnostics/whoopsie-preferences
+src/diagnostics/com.ubuntu.whoopsiepreferences.policy
+src/diagnostics/.libs

=== modified file 'configure.ac'
--- configure.ac	2013-04-21 07:52:28 +0000
+++ configure.ac	2013-06-19 15:17:27 +0000
@@ -108,7 +108,7 @@
 
 AM_CONDITIONAL([HAVE_CCPANEL], [test -n "$CCPANEL_LIBS"  && test "x$with_ccpanel" != xno])
 
-AM_CONDITIONAL([HAVE_WHOOPSIE], [test -n "$POLKIT_LIBS"])
+AM_CONDITIONAL([HAVE_WHOOPSIE], [test -n "$POLKIT_LIBS" && test -n "$LIBWHOOPSIE_LIBS"])
 
 
 AC_CONFIG_FILES([
@@ -121,6 +121,7 @@
 
 
 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
 else
   WHOOPSIE_ENABLE=no

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-04-20 12:35:20 +0000
+++ src/Makefile.am	2013-06-19 15:17:27 +0000
@@ -79,14 +79,25 @@
 	$(SHARED_CFLAGS) \
 	$(CCPANEL_CFLAGS)
 
+if HAVE_WHOOPSIE
+libactivity_log_manager_la_CFLAGS += \
+	$(POLKIT_CFLAGS) \
+	-DGNOMECC_UI_DIR=\""$(gnomeccuidir)"\"
+endif
+
 activity_log_manager_SOURCES = \
 	$(SHARED_SOURCES) \
 	alm.vala \
 	$(NULL)
 libactivity_log_manager_la_SOURCES = \
 	$(SHARED_SOURCES:.vala=.c) \
-	alm-cc.c \
-	$(NULL)
+	alm-cc.c
+
+if HAVE_WHOOPSIE
+libactivity_log_manager_la_SOURCES += \
+	diagnostics-widget.c \
+	diagnostics/whoopsie-generated.c
+endif
 
 
 activity_log_manager_LDFLAGS = \
@@ -99,6 +110,11 @@
 	$(SHARED_LIBS) \
 	$(CCPANEL_LIBS)
 
+if HAVE_WHOOPSIE
+libactivity_log_manager_la_LIBADD += \
+	$(POLKIT_LIBS)
+endif
+
 GENERATED_C_FILES = $(activity_log_manager_SOURCES:.vala=.c)
 
 GENERATED_O_FILES = $(activity_log_manager_SOURCES:.vala=.o)

=== modified file 'src/alm-cc.c'
--- src/alm-cc.c	2013-02-16 02:56:21 +0000
+++ src/alm-cc.c	2013-06-19 15:17:27 +0000
@@ -24,7 +24,7 @@
 extern void* alm_activity_log_manager_new (void);
 #ifdef HAVE_WHOOPSIE
 extern void alm_activity_log_manager_append_page (void* alm, GtkWidget* widget, const gchar* label);
-extern void* whoopsie_daisy_preferences_new (void);
+extern GtkWidget* whoopsie_daisy_preferences_new (void);
 #endif
 
 #define ALM_TYPE_MAIN_WINDOW_PANEL alm_main_window_panel_get_type()

=== added file 'src/diagnostics-widget.c'
--- src/diagnostics-widget.c	1970-01-01 00:00:00 +0000
+++ src/diagnostics-widget.c	2013-06-19 15:17:27 +0000
@@ -0,0 +1,255 @@
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+#include <polkit/polkit.h>
+#include <stdlib.h>
+
+#define _GNU_SOURCE
+#include <stdio.h>
+
+#include "diagnostics/whoopsie-generated.h"
+
+static WhoopsiePreferences* proxy = NULL;
+
+#define POL_PATH "com.ubuntu.whoopsiepreferences.change"
+#define PRIVACY_URL "http://www.ubuntu.com/aboutus/privacypolicy?crashdb"
+#define SYSTEM_ERRORS_URL "https://errors.ubuntu.com/user"
+
+#define WHOOPSIE_DAISY_TYPE_PREFERENCES (whoopsie_daisy_preferences_get_type())
+#define WHOOPSIE_DAISY_PREFERENCES(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+    WHOOPSIE_DAISY_TYPE_PREFERENCES, WhoopsieDaisyPreferences))
+#define WHOOPSIE_DAISY_PREFERENCES_PRIVATE(o) \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((o), WHOOPSIE_DAISY_TYPE_PREFERENCES, WhoopsieDaisyPreferencesPrivate))
+
+GType whoopsie_daisy_preferences_get_type (void) G_GNUC_CONST;
+
+typedef struct _WhoopsieDaisyPreferences WhoopsieDaisyPreferences;
+typedef struct _WhoopsieDaisyPreferencesClass WhoopsieDaisyPreferencesClass;
+typedef struct _WhoopsieDaisyPreferencesPrivate WhoopsieDaisyPreferencesPrivate;
+
+struct _WhoopsieDaisyPreferencesPrivate
+{
+    GtkBuilder* builder;
+    GPermission* permission;
+};
+
+struct _WhoopsieDaisyPreferences
+{
+    GtkBox parent;
+    WhoopsieDaisyPreferencesPrivate* priv;
+};
+
+struct _WhoopsieDaisyPreferencesClass
+{
+    GtkBoxClass parent_class;
+};
+
+G_DEFINE_TYPE (WhoopsieDaisyPreferences, whoopsie_daisy_preferences, GTK_TYPE_BOX)
+
+static void
+whoopsie_daisy_preferences_dispose (GObject* object)
+{
+    WhoopsieDaisyPreferencesPrivate* priv = WHOOPSIE_DAISY_PREFERENCES (object)->priv;
+
+    if (priv->builder) {
+        g_object_unref (priv->builder);
+        priv->builder = NULL;
+    }
+    if (priv->permission) {
+        g_object_unref (priv->permission);
+        priv->permission = NULL;
+    }
+}
+
+static void
+whoopsie_daisy_preferences_class_init (WhoopsieDaisyPreferencesClass *klass)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    g_type_class_add_private (klass, sizeof (WhoopsieDaisyPreferencesPrivate));
+    object_class->dispose = whoopsie_daisy_preferences_dispose;
+}
+
+static void
+on_privacy_policy_clicked (GtkWidget* button, gpointer user_data)
+{
+    if (system ("xdg-open " PRIVACY_URL) < 0)
+        g_warning ("Error opening URL.\n");
+}
+
+static void
+on_show_previous_reports_clicked (GtkWidget* button, gpointer user_data)
+{
+    GError* error = NULL;
+    gchar* identifier = NULL;
+    gchar* command = NULL;
+    whoopsie_preferences_call_get_identifier_sync (proxy, &identifier, NULL, &error);
+
+    if (!error) {
+        asprintf (&command, "xdg-open " SYSTEM_ERRORS_URL "/%s", identifier);
+        if (system (command) < 0)
+            g_warning ("Error opening URL.\n");
+    } else {
+        g_printerr ("Error getting identifier: %s\n", error->message);
+        g_error_free (error);
+    }
+}
+
+static void
+on_permission_changed (GPermission* permission, GParamSpec* pspec, gpointer data)
+{
+    gboolean allowed;
+    GtkWidget* error_reports_box = NULL;
+    GtkWidget* metrics_reports_box = NULL;
+    WhoopsieDaisyPreferencesPrivate* priv = WHOOPSIE_DAISY_PREFERENCES (data)->priv;
+
+    error_reports_box = GTK_WIDGET (gtk_builder_get_object (
+                                    priv->builder, "error_reports_box"));
+    metrics_reports_box = GTK_WIDGET (gtk_builder_get_object (
+                                      priv->builder, "metrics_reports_box"));
+
+    allowed = g_permission_get_allowed (permission);
+    gtk_widget_set_sensitive(error_reports_box, allowed);
+    gtk_widget_set_sensitive(metrics_reports_box, allowed);
+    gtk_container_foreach (GTK_CONTAINER (error_reports_box), (GtkCallback)gtk_widget_set_sensitive, allowed);
+    gtk_container_foreach (GTK_CONTAINER (metrics_reports_box), (GtkCallback)gtk_widget_set_sensitive, allowed);
+}
+
+static void
+on_submit_error_reports_checked (GtkToggleButton* button, gpointer user_data)
+{
+    GError* error = NULL;
+
+    whoopsie_preferences_call_set_report_crashes_sync (proxy,
+        gtk_toggle_button_get_active (button), NULL, &error);
+    if (error != NULL) {
+        g_printerr ("Error setting crash reporting: %s\n", error->message);
+        g_error_free (error);
+    }
+}
+
+static void
+on_submit_metrics_reports_checked (GtkToggleButton* button, gpointer user_data)
+{
+    GError* error = NULL;
+
+    whoopsie_preferences_call_set_report_metrics_sync (proxy,
+        gtk_toggle_button_get_active (button), NULL, &error);
+    if (error != NULL) {
+        g_printerr ("Error setting metrics reporting: %s\n", error->message);
+        g_error_free (error);
+    }
+}
+
+static void
+on_properties_changed (WhoopsiePreferences* interface,
+                       GVariant* changed_properties,
+                       const gchar* const* invalidated_properties,
+                       gpointer user_data)
+{
+    WhoopsieDaisyPreferencesPrivate* priv = WHOOPSIE_DAISY_PREFERENCES (user_data)->priv;
+    gboolean report_errors, report_metrics;
+    GtkWidget* submit_error_reports = NULL;
+    GtkWidget* submit_metrics_reports = NULL;
+
+    submit_error_reports = GTK_WIDGET (
+        gtk_builder_get_object (priv->builder, "submit_error_reports"));
+    submit_metrics_reports = GTK_WIDGET (
+        gtk_builder_get_object (priv->builder, "submit_metrics_reports"));
+
+    report_errors = whoopsie_preferences_get_report_crashes (interface);
+    report_metrics = whoopsie_preferences_get_report_metrics (interface);
+
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (submit_error_reports), report_errors);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (submit_metrics_reports), report_metrics);
+}
+
+static void
+whoopsie_daisy_preferences_setup_dbus (WhoopsieDaisyPreferences *self, GError *error)
+{
+    proxy = whoopsie_preferences_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+                                         G_DBUS_PROXY_FLAGS_NONE,
+                                         "com.ubuntu.WhoopsiePreferences",
+                                         "/com/ubuntu/WhoopsiePreferences",
+                                         NULL, &error);
+    if (!proxy)
+        return;
+
+    g_signal_connect (proxy, "g-properties-changed",
+                                   G_CALLBACK (on_properties_changed), self);
+    on_properties_changed (proxy, NULL, NULL, self);
+}
+static void
+whoopsie_daisy_preferences_init (WhoopsieDaisyPreferences *self)
+{
+    GError *error = NULL;
+    GtkWidget* privacy_page = NULL;
+    GtkWidget* unlock_align = NULL;
+    GtkWidget* unlock_button = NULL;
+    GtkWidget* submit_error_reports = NULL;
+    GtkWidget* submit_metrics_reports = NULL;
+    GtkWidget* privacy_policy = NULL;
+    GtkWidget* show_previous_reports = NULL;
+    WhoopsieDaisyPreferencesPrivate* priv;
+    priv = self->priv = WHOOPSIE_DAISY_PREFERENCES_PRIVATE (self);
+    
+    priv->builder = gtk_builder_new ();
+    gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE);
+    gtk_builder_add_from_file(priv->builder, GNOMECC_UI_DIR "/whoopsie.ui", &error);
+    if (error != NULL) {
+        g_warning ("Could not load interface file: %s", error->message);
+        g_error_free (error);
+        return;
+    }
+    submit_error_reports = GTK_WIDGET (
+        gtk_builder_get_object (priv->builder, "submit_error_reports"));
+    submit_metrics_reports = GTK_WIDGET (
+        gtk_builder_get_object (priv->builder, "submit_metrics_reports"));
+    gtk_widget_hide (submit_metrics_reports);
+    privacy_page = GTK_WIDGET (
+        gtk_builder_get_object (priv->builder, "privacy_page_box"));
+    unlock_align = GTK_WIDGET (
+        gtk_builder_get_object (priv->builder, "unlock_alignment"));
+    privacy_policy = GTK_WIDGET (
+        gtk_builder_get_object (priv->builder, "privacy_policy"));
+    show_previous_reports = GTK_WIDGET (
+        gtk_builder_get_object (priv->builder, "show_previous_reports"));
+
+    gtk_widget_reparent (privacy_page, (GtkWidget *) self);
+    g_object_set (self, "valign", GTK_ALIGN_START, NULL);
+
+    priv->permission = polkit_permission_new_sync (POL_PATH, NULL, NULL, &error);
+    if (!priv->permission) {
+        g_warning ("Could not acquire permission: %s", error->message);
+        g_error_free (error);
+    }
+
+    unlock_button = gtk_lock_button_new (priv->permission);
+    gtk_container_add (GTK_CONTAINER (unlock_align), GTK_WIDGET (unlock_button));
+    gtk_widget_show (unlock_button);
+
+    g_signal_connect (priv->permission, "notify", G_CALLBACK (on_permission_changed), self);
+    on_permission_changed (priv->permission, NULL, self);
+
+    whoopsie_daisy_preferences_setup_dbus (self, error);
+    if (error) {
+        g_warning ("Could not set up DBus connection: %s", error->message);
+        g_error_free (error);
+    }
+
+    g_signal_connect (submit_error_reports, "toggled",
+                      G_CALLBACK (on_submit_error_reports_checked), NULL);
+    g_signal_connect (submit_metrics_reports, "toggled",
+                      G_CALLBACK (on_submit_metrics_reports_checked), NULL);
+    g_signal_connect (privacy_policy, "clicked",
+                      G_CALLBACK (on_privacy_policy_clicked), NULL);
+    g_signal_connect (show_previous_reports, "clicked",
+                      G_CALLBACK (on_show_previous_reports_clicked), NULL);
+}
+
+GtkWidget*
+whoopsie_daisy_preferences_new (void)
+{
+    printf ("GType: %d\n", (int)WHOOPSIE_DAISY_TYPE_PREFERENCES);
+    return g_object_new (WHOOPSIE_DAISY_TYPE_PREFERENCES, NULL);
+}
+