Merge lp:~jbicha/activity-log-manager/search-and-security-only-for-ccpanel into lp:activity-log-manager

[Jeremy Bícha]

This way other distros don't have to depend on accountsservice if we add the remaining proposed items to the Security tab for instance.

[lp:~jbicha/activity-log-manager/search-and-security-only-for-ccpanel]

80. By Jeremy Bícha on 2013-07-11

fix warning

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

Looks like there is some issue. Install it and run it with gdb
> gdb gnome-control-center

System Settings open, click on Privacy and the whole UI freezes. Then after sometime, this error appears

Program received signal SIGTRAP, Trace/breakpoint trap.
0xb7650919 in g_logv (log_domain=log_domain@entry=0xb7882798 "GLib-GIO", log_level=<optimized out>, log_level@entry=G_LOG_LEVEL_ERROR,
    format=format@entry=0xb789cd5c "Settings schema '%s' does not contain a key named '%s'", args=args@entry=0xbfffdabc "\b\270\071\200\331\351", <incomplete sequence \364\265>)
    at gmessages.c:989
989 G_BREAKPOINT ();
(gdb) bt
#0 0xb7650919 in g_logv (log_domain=log_domain@entry=0xb7882798 "GLib-GIO", log_level=<optimized out>, log_level@entry=G_LOG_LEVEL_ERROR,
    format=format@entry=0xb789cd5c "Settings schema '%s' does not contain a key named '%s'", args=args@entry=0xbfffdabc "\b\270\071\200\331\351", <incomplete sequence \364\265>)
    at gmessages.c:989
#1 0xb7650a23 in g_log (log_domain=log_domain@entry=0xb7882798 "GLib-GIO", log_level=log_level@entry=G_LOG_LEVEL_ERROR,
    format=format@entry=0xb789cd5c "Settings schema '%s' does not contain a key named '%s'") at gmessages.c:1025
#2 0xb7834730 in g_settings_schema_get_value (schema=schema@entry=0x9070e660, key=key@entry=0xb5f4e9d9 "ubuntu-lock-on-suspend") at gsettingsschema.c:640
#3 0xb78348e8 in g_settings_schema_key_init (key=<optimized out>, key@entry=0x80355cb0, schema=<optimized out>, name=<optimized out>, name@entry=0xb5f4e9d9 "ubuntu-lock-on-suspend")
    at gsettingsschema.c:751
#4 0xb783a3c8 in g_settings_bind_with_mapping (settings=settings@entry=0x802f2090, key=key@entry=0xb5f4e9d9 "ubuntu-lock-on-suspend", object=object@entry=0x80347af8,
    property=property@entry=0xb5f4e654 "active", flags=G_SETTINGS_BIND_DEFAULT, get_mapping=0x0, set_mapping=0x0, user_data=user_data@entry=0x0, destroy=destroy@entry=0x0) at gsettings.c:2599
#5 0xb783a8e6 in g_settings_bind (settings=0x802f2090, key=key@entry=0xb5f4e9d9 "ubuntu-lock-on-suspend", object=object@entry=0x80347af8, property=property@entry=0xb5f4e654 "active",
    flags=<optimized out>, flags@entry=G_SETTINGS_BIND_DEFAULT) at gsettings.c:2543
#6 0xb5f35dce in alm_security_widget_set_up_ui (self=self@entry=0x8006bd38) at security-widget.c:406
#7 0xb5f364db in alm_security_widget_construct (object_type=2151247960) at security-widget.c:110
#8 0xb5f3658c in alm_security_widget_new () at security-widget.c:116
#9 0xb5f4ab97 in alm_main_window_panel_init (self=0x803018b8) at alm-cc.c:72

review: Needs Fixing

[Jeremy Bícha (jbicha)]

I can't duplicate that problem and I don't think this merge proposal makes many changes to the code. Which version of gnome-screensaver do you have installed? Because your gdb output seems to say something about a missing ubuntu-lock-on-suspend gsettings key? I've never really learned how to use gdb though.

$ XDG_CURRENT_DESKTOP=Unity gdb gnome-control-center
GNU gdb (GDB) 7.5.91.20130417-cvs-ubuntu
Copyright (C) 2013 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law. Type "show copying"
and "show warranty" for details.
This GDB was configured as "x86_64-linux-gnu".
For bug reporting instructions, please see:
<http://www.gnu.org/software/gdb/bugs/>...
Reading symbols from /usr/bin/gnome-control-center...(no debugging symbols found)...done.
(gdb) start
Temporary breakpoint 1 at 0x71c0
Starting program: /usr/bin/gnome-control-center
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".

Temporary breakpoint 1, 0x000055555555b1c0 in main ()
(gdb) step
Single stepping until exit from function main,
which has no line number information.
[New Thread 0x7fffeedc7700 (LWP 22969)]
[New Thread 0x7fffb30c5700 (LWP 22970)]
[New Thread 0x7fffb28c4700 (LWP 22971)]
[New Thread 0x7fffb1c22700 (LWP 22973)]
[Thread 0x7fffb28c4700 (LWP 22971) exited]
[New Thread 0x7fffb28c4700 (LWP 22998)]
[New Thread 0x7fffb1421700 (LWP 22999)]
[New Thread 0x7fffb0c20700 (LWP 23000)]
[New Thread 0x7fffa3fff700 (LWP 23001)]

** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed

** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed

** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed

** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed

** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed

** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed

** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed

** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed
[New Thread 0x7fffa37fe700 (LWP 23002)]
[New Thread 0x7fffa2ffd700 (LWP 23003)]
[New Thread 0x7fffa27fc700 (LWP 23004)]
[New Thread 0x7fffa1ffb700 (LWP 23005)]

** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_has_key: assertion 'self != NULL' failed

** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_has_key: assertion 'self != NULL' failed

** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_has_key: assertion 'self != NULL' failed

** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_has_key: assertion 'self != NULL' failed
Error setting crash reporting: GDBus.Error:org.freedesktop.DBus.Error.AuthFailed: Not authorized.
Error setting metrics reporting: GDBus.Error:org.freed...

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

Yes, it looks like the problem is on my side. I don't have "org.gnome.desktop.screensaver" in my gsettings.

review: Approve

[Jeremy Bícha (jbicha)]

Oh, Ubuntu GNOME 13.10 doesn't install gnome-screensaver by default since Ubuntu GNOME doesn't actually use it.

Unity does recommend indicator-session which recommends gnome-screensaver but that's not a hard dependency
(perhaps so that users can replace it with xscreensaver or whatever).

We need to figure out a way to test whether a gsettings key exists before trying to load it (see bug 1195481 for another example of this kind of bug).

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

Oh yeah. That might be a problem. I am running Ubuntu GNOME

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-07-09 01:34:49 +0000
+++ src/Makefile.am	2013-07-11 20:46:25 +0000
@@ -24,8 +24,6 @@
 SHARED_SOURCES = \
 	blacklist-dbus.vala \
 	activity-log-manager.vala \
-	searchresults-widget.vala \
-	security-widget.vala \
         unified-privacy-files.vala \
         unified-privacy-applications.vala \
         unified-privacy-history.vala \
@@ -108,6 +106,8 @@
 endif
 
 libactivity_log_manager_la_SOURCES = \
+	searchresults-widget.vala \
+	security-widget.vala \
 	$(SHARED_SOURCES:.vala=.c) \
 	alm-cc.c
 

=== modified file 'src/activity-log-manager.vala'
--- src/activity-log-manager.vala	2013-07-09 23:08:45 +0000
+++ src/activity-log-manager.vala	2013-07-11 20:46:25 +0000
@@ -20,7 +20,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.";
  */
- 
+
 #if DIAGNOSTIC
 extern Gtk.Widget whoopsie_daisy_preferences_new ();
 #endif
@@ -29,8 +29,6 @@
 
 	public class ActivityLogManager : Gtk.Box {
 		private Gtk.Notebook notebook;
-		private SecurityWidget security_widget;
-		private SearchResultsWidget searchresults_widget;
 		private PrivacyWidget privacy_widget;
 		private Gtk.Widget whoopsie;
 
@@ -50,17 +48,6 @@
 			var privacy_label = new Gtk.Label(_("Files & Applications"));
 			notebook.append_page(privacy_widget, privacy_label);
 
-			if (GLib.Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity")
-			{
-				security_widget = new SecurityWidget();
-				var security_label = new Gtk.Label(_("Security"));
-				notebook.prepend_page(security_widget, security_label);
-
-				searchresults_widget = new SearchResultsWidget();
-				var searchresults_label = new Gtk.Label(_("Search"));
-				notebook.append_page(searchresults_widget, searchresults_label);
-			}
-
 #if DIAGNOSTIC
 			whoopsie = whoopsie_daisy_preferences_new ();
 			var whoopsie_label = new Gtk.Label(_("Diagnostics"));
@@ -69,9 +56,9 @@
 			this.show_all();
 		}
 
-		public void append_page (Gtk.Widget widget, string label) {
+		public void insert_page (Gtk.Widget widget, string label, int position) {
 			var app_label = new Gtk.Label(_(label));
-			notebook.append_page(widget, app_label);
+			notebook.insert_page(widget, app_label, position);
 		}
 	}
 }

=== modified file 'src/alm-cc.c'
--- src/alm-cc.c	2013-06-28 16:24:00 +0000
+++ src/alm-cc.c	2013-07-11 20:46:25 +0000
@@ -22,6 +22,9 @@
 #include <libgnome-control-center/cc-panel.h>
 
 extern void* alm_activity_log_manager_new (void);
+extern void alm_activity_log_manager_insert_page (void* alm, GtkWidget* widget, const gchar* label, int position);
+extern GtkWidget* alm_security_widget_new(void);
+extern GtkWidget* alm_search_results_widget_new(void);
 
 #define ALM_TYPE_MAIN_WINDOW_PANEL alm_main_window_panel_get_type()
 
@@ -54,6 +57,12 @@
 alm_main_window_panel_init (AlmMainWindowPanel *self)
 {
   GtkWidget *widget = GTK_WIDGET (alm_activity_log_manager_new ());
+
+  GtkWidget *security = GTK_WIDGET (alm_security_widget_new ());
+  alm_activity_log_manager_insert_page (widget, security, _("Security"), 0);
+  GtkWidget *search = GTK_WIDGET (alm_search_results_widget_new ());
+  alm_activity_log_manager_insert_page (widget, search, _("Search"), 2);
+
   gtk_widget_show_all (widget);
   gtk_container_add (GTK_CONTAINER (self), widget);
 }