diff -Nru activity-log-manager-0.9.7/debian/changelog activity-log-manager-0.9.7/debian/changelog --- activity-log-manager-0.9.7/debian/changelog 2014-03-24 15:38:38.000000000 +0000 +++ activity-log-manager-0.9.7/debian/changelog 2014-03-25 13:33:13.000000000 +0000 @@ -1,3 +1,18 @@ +activity-log-manager (0.9.7-0ubuntu12) trusty; urgency=medium + + * debian/patches/10_build-with-gee-0.8.patch: Port to gee 0.8 API to avoid + loading two gee versions in the same process (LP: #1293036) + * 01_really_hide_automatic_reports.patch: Delete, this is obsolete given + 03_use_libwhoopsie-preferences.patch. Add 13_hide_automatic_reports.patch + to achieve this with that new patch. (LP: #1203042) + * 11_make_all_widgets_sensitive.patch: Recursively make all widgets + sensitive/insensitive when we need to, to avoid missing some. + * 12_hide_lock_unlock_button.patch: Hide Lock button when it doesn't do + anything (when the user can't drop the permissions). (LP: #1239752) + * 14_seconds_combo.patch: Make the entries translatable. (LP: #1235627) + + -- Iain Lane Tue, 25 Mar 2014 12:56:33 +0000 + activity-log-manager (0.9.7-0ubuntu11) trusty; urgency=medium * Unify the options between the 'brightness and lock' panel in g-c-c and diff -Nru activity-log-manager-0.9.7/debian/control activity-log-manager-0.9.7/debian/control --- activity-log-manager-0.9.7/debian/control 2014-02-03 16:44:07.000000000 +0000 +++ activity-log-manager-0.9.7/debian/control 2014-03-24 16:12:41.000000000 +0000 @@ -9,7 +9,7 @@ intltool (>= 0.35.0), # libaccountsservice-dev, libgcrypt11-dev, - libgee-dev, + libgee-0.8-dev, libglib2.0-dev, libgnome-control-center-dev, libunity-control-center-dev, diff -Nru activity-log-manager-0.9.7/debian/patches/03_use_libwhoopsie-preferences.patch activity-log-manager-0.9.7/debian/patches/03_use_libwhoopsie-preferences.patch --- activity-log-manager-0.9.7/debian/patches/03_use_libwhoopsie-preferences.patch 2014-02-03 16:44:07.000000000 +0000 +++ activity-log-manager-0.9.7/debian/patches/03_use_libwhoopsie-preferences.patch 2014-03-25 12:50:27.000000000 +0000 @@ -1,8 +1,8 @@ === modified file 'configure.ac' -Index: activity-log-manager-0.9.7/configure.ac +Index: b/configure.ac =================================================================== ---- activity-log-manager-0.9.7.orig/configure.ac 2014-02-03 11:29:09.025259970 +0000 -+++ activity-log-manager-0.9.7/configure.ac 2014-02-03 11:29:09.013259971 +0000 +--- a/configure.ac ++++ b/configure.ac @@ -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]) @@ -42,10 +42,10 @@ 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 -Index: activity-log-manager-0.9.7/data/Makefile.am +Index: b/data/Makefile.am =================================================================== ---- activity-log-manager-0.9.7.orig/data/Makefile.am 2014-02-03 11:29:09.025259970 +0000 -+++ activity-log-manager-0.9.7/data/Makefile.am 2014-02-03 11:29:09.013259971 +0000 +--- a/data/Makefile.am ++++ b/data/Makefile.am @@ -33,10 +33,15 @@ switchboard_DATA = alm-switchboard.plug endif @@ -63,10 +63,10 @@ CLEANFILES = activity-log-manager.desktop gnome-activity-log-manager-panel.desktop check: $(desktop_DATA) -Index: activity-log-manager-0.9.7/po/POTFILES.in +Index: b/po/POTFILES.in =================================================================== ---- activity-log-manager-0.9.7.orig/po/POTFILES.in 2014-02-03 11:29:09.025259970 +0000 -+++ activity-log-manager-0.9.7/po/POTFILES.in 2014-02-03 11:29:09.013259971 +0000 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in @@ -9,5 +9,4 @@ src/unified-privacy-applications.vala src/unified-privacy-history.vala @@ -74,10 +74,10 @@ -src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in -[type: gettext/glade]src/diagnostics/whoopsie.ui +[type: gettext/glade]data/whoopsie.ui -Index: activity-log-manager-0.9.7/src/Makefile.am +Index: b/src/Makefile.am =================================================================== ---- activity-log-manager-0.9.7.orig/src/Makefile.am 2014-02-03 11:29:09.025259970 +0000 -+++ activity-log-manager-0.9.7/src/Makefile.am 2014-02-03 11:29:09.013259971 +0000 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -42,6 +42,11 @@ $(POLKIT_LIBS) \ -lm @@ -139,10 +139,10 @@ GENERATED_C_FILES = $(SHARED_SOURCES:.vala=.c) GENERATED_O_FILES = $(SHARED_SOURCES:.vala=.o) -Index: activity-log-manager-0.9.7/src/diagnostics-widget.c +Index: b/src/diagnostics-widget.c =================================================================== ---- activity-log-manager-0.9.7.orig/src/diagnostics-widget.c 2014-02-03 11:29:09.025259970 +0000 -+++ activity-log-manager-0.9.7/src/diagnostics-widget.c 2014-02-03 11:29:29.649259480 +0000 +--- a/src/diagnostics-widget.c ++++ b/src/diagnostics-widget.c @@ -6,7 +6,7 @@ #define _GNU_SOURCE #include @@ -176,10 +176,10 @@ g_object_set (self, "valign", GTK_ALIGN_START, NULL); priv->permission = polkit_permission_new_sync (POL_PATH, NULL, NULL, &error); -Index: activity-log-manager-0.9.7/src/diagnostics/Makefile.am +Index: b/src/diagnostics/Makefile.am =================================================================== ---- activity-log-manager-0.9.7.orig/src/diagnostics/Makefile.am 2014-02-03 11:29:09.025259970 +0000 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/src/diagnostics/Makefile.am ++++ /dev/null @@ -1,50 +0,0 @@ -if HAVE_CCPANEL -ccpaneldir = $(CCPANEL_DIR) @@ -231,10 +231,10 @@ -CLEANFILES = whoopsie-generated.[ch] \ - $(policykit_DATA) -@INTLTOOL_POLICY_RULE@ -Index: activity-log-manager-0.9.7/src/diagnostics/com.ubuntu.WhoopsiePreferences.conf +Index: b/src/diagnostics/com.ubuntu.WhoopsiePreferences.conf =================================================================== ---- activity-log-manager-0.9.7.orig/src/diagnostics/com.ubuntu.WhoopsiePreferences.conf 2014-02-03 11:29:09.025259970 +0000 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/src/diagnostics/com.ubuntu.WhoopsiePreferences.conf ++++ /dev/null @@ -1,26 +0,0 @@ - - -Index: activity-log-manager-0.9.7/src/diagnostics/com.ubuntu.WhoopsiePreferences.service +Index: b/src/diagnostics/com.ubuntu.WhoopsiePreferences.service =================================================================== ---- activity-log-manager-0.9.7.orig/src/diagnostics/com.ubuntu.WhoopsiePreferences.service 2014-02-03 11:29:09.025259970 +0000 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/src/diagnostics/com.ubuntu.WhoopsiePreferences.service ++++ /dev/null @@ -1,4 +0,0 @@ -[D-BUS Service] -Name=com.ubuntu.WhoopsiePreferences -Exec=/usr/bin/whoopsie-preferences -User=root -Index: activity-log-manager-0.9.7/src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in +Index: b/src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in =================================================================== ---- activity-log-manager-0.9.7.orig/src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in 2014-02-03 11:29:09.025259970 +0000 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in ++++ /dev/null @@ -1,18 +0,0 @@ - - - - -Index: activity-log-manager-0.9.7/src/diagnostics/whoopsie-preferences.c +Index: b/src/diagnostics/whoopsie-preferences.c =================================================================== ---- activity-log-manager-0.9.7.orig/src/diagnostics/whoopsie-preferences.c 2014-02-03 11:29:09.025259970 +0000 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/src/diagnostics/whoopsie-preferences.c ++++ /dev/null @@ -1,363 +0,0 @@ -/* whoopsie - * @@ -662,10 +662,10 @@ - g_key_file_free (key_file); - return 0; -} -Index: activity-log-manager-0.9.7/src/diagnostics/whoopsie-preferences.xml +Index: b/src/diagnostics/whoopsie-preferences.xml =================================================================== ---- activity-log-manager-0.9.7.orig/src/diagnostics/whoopsie-preferences.xml 2014-02-03 11:29:09.025259970 +0000 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/src/diagnostics/whoopsie-preferences.xml ++++ /dev/null @@ -1,15 +0,0 @@ - - @@ -682,10 +682,10 @@ - - - -Index: activity-log-manager-0.9.7/data/whoopsie.ui +Index: b/data/whoopsie.ui =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ activity-log-manager-0.9.7/data/whoopsie.ui 2014-02-03 11:29:09.017259970 +0000 +--- /dev/null ++++ b/data/whoopsie.ui @@ -0,0 +1,287 @@ + + @@ -974,10 +974,10 @@ + + + -Index: activity-log-manager-0.9.7/src/diagnostics/Makefile.in +Index: b/src/diagnostics/Makefile.in =================================================================== ---- activity-log-manager-0.9.7.orig/src/diagnostics/Makefile.in 2014-02-03 11:29:09.025259970 +0000 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/src/diagnostics/Makefile.in ++++ /dev/null @@ -1,874 +0,0 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. -# @configure_input@ @@ -1853,10 +1853,10 @@ -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: -Index: activity-log-manager-0.9.7/src/diagnostics/whoopsie-generated.c +Index: b/src/diagnostics/whoopsie-generated.c =================================================================== ---- activity-log-manager-0.9.7.orig/src/diagnostics/whoopsie-generated.c 2014-02-03 11:29:09.025259970 +0000 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/src/diagnostics/whoopsie-generated.c ++++ /dev/null @@ -1,1740 +0,0 @@ -/* - * Generated by gdbus-codegen 2.37.4. DO NOT EDIT. @@ -3598,10 +3598,10 @@ - return WHOOPSIE_PREFERENCES (g_object_new (TYPE_WHOOPSIE_PREFERENCES_SKELETON, NULL)); -} - -Index: activity-log-manager-0.9.7/src/diagnostics/whoopsie-generated.h +Index: b/src/diagnostics/whoopsie-generated.h =================================================================== ---- activity-log-manager-0.9.7.orig/src/diagnostics/whoopsie-generated.h 2014-02-03 11:29:09.025259970 +0000 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/src/diagnostics/whoopsie-generated.h ++++ /dev/null @@ -1,237 +0,0 @@ -/* - * Generated by gdbus-codegen 2.37.4. DO NOT EDIT. @@ -3840,11 +3840,11 @@ -G_END_DECLS - -#endif /* __WHOOPSIE_GENERATED_H__ */ -Index: activity-log-manager-0.9.7/src/diagnostics/whoopsie.ui +Index: b/src/diagnostics/whoopsie.ui =================================================================== ---- activity-log-manager-0.9.7.orig/src/diagnostics/whoopsie.ui 2014-02-03 11:29:09.025259970 +0000 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,266 +0,0 @@ +--- a/src/diagnostics/whoopsie.ui ++++ /dev/null +@@ -1,284 +0,0 @@ - - - @@ -4009,6 +4009,24 @@ - vertical - 3 - +- +- Send a report automatically if a problem prevents login +- False +- False +- False +- False +- False +- False +- 0 +- True +- +- +- False +- True +- 0 +- +- +- - - True - False diff -Nru activity-log-manager-0.9.7/debian/patches/10_build-with-gee-0.8.patch activity-log-manager-0.9.7/debian/patches/10_build-with-gee-0.8.patch --- activity-log-manager-0.9.7/debian/patches/10_build-with-gee-0.8.patch 1970-01-01 00:00:00.000000000 +0000 +++ activity-log-manager-0.9.7/debian/patches/10_build-with-gee-0.8.patch 2014-03-25 12:54:26.000000000 +0000 @@ -0,0 +1,90 @@ +Description: Port to Gee 0.8 API +Authors: Iain Lane +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/activity-log-manager/+bug/1293036 + + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -43,7 +43,7 @@ + + PKG_CHECK_MODULES(ZEITGEIST, zeitgeist-2.0, [HAVE_LIBZG=yes]) + PKG_CHECK_MODULES(GTK, gtk+-3.0, [HAVE_GTK=yes]) +-PKG_CHECK_MODULES(GEE, gee-1.0, [HAVE_GEE=yes]) ++PKG_CHECK_MODULES(GEE, gee-0.8, [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(LIBWHOOPSIEPREFS, libwhoopsie-preferences, [HAVE_LIBWHOOPSIE=yes], [HAVE_LIBWHOOPSIE=no]) +Index: b/src/Makefile.am +=================================================================== +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -4,7 +4,7 @@ + --pkg zeitgeist-2.0 \ + --pkg glib-2.0 \ + --pkg gtk+-3.0 \ +- --pkg gee-1.0 \ ++ --pkg gee-0.8 \ + --target-glib=2.26 \ + --pkg gio-unix-2.0 \ + config.vapi +Index: b/src/gnome-control-center/Makefile.am +=================================================================== +--- a/src/gnome-control-center/Makefile.am ++++ b/src/gnome-control-center/Makefile.am +@@ -2,7 +2,7 @@ + --pkg zeitgeist-2.0 \ + --pkg glib-2.0 \ + --pkg gtk+-3.0 \ +- --pkg gee-1.0 \ ++ --pkg gee-0.8 \ + --target-glib=2.26 \ + --pkg gio-unix-2.0 \ + ../config.vapi +Index: b/src/unity-control-center/Makefile.am +=================================================================== +--- a/src/unity-control-center/Makefile.am ++++ b/src/unity-control-center/Makefile.am +@@ -2,7 +2,7 @@ + --pkg zeitgeist-2.0 \ + --pkg glib-2.0 \ + --pkg gtk+-3.0 \ +- --pkg gee-1.0 \ ++ --pkg gee-0.8 \ + --target-glib=2.26 \ + --pkg gio-unix-2.0 \ + ../config.vapi +Index: b/src/unified-privacy.vala +=================================================================== +--- a/src/unified-privacy.vala ++++ b/src/unified-privacy.vala +@@ -114,7 +114,8 @@ + remove_folder_from_view(folder); + }); + +- mime_dict = new HashMap(str_hash, str_equal); ++ mime_dict = new HashMap((Gee.HashDataFunc) str_hash, ++ (Gee.EqualDataFunc) str_equal); + mime_dict.set(_("Music"), NFO.AUDIO); + mime_dict.set(_("Videos"), NFO.VIDEO); + mime_dict.set(_("Pictures"), NFO.IMAGE); +@@ -135,7 +136,8 @@ + UserDirectory.VIDEOS + }; + +- defined_dirs = new HashMap(str_hash, str_equal); ++ defined_dirs = new HashMap((Gee.HashDataFunc) str_hash, ++ (Gee.EqualDataFunc) str_equal); + for(int i = 0; i < special_dirs.length; i++) { + string dir_path = Environment.get_user_special_dir(special_dirs[i]); + if (dir_path != null) { +@@ -213,7 +215,7 @@ + // Checkbox Box + var checkbox_hbox = new Box(Orientation.VERTICAL, 0); + +- CompareFunc mime_compare = (s1, s2) => { ++ GLib.CompareDataFunc mime_compare = (s1, s2) => { + return s1.collate(s2); + }; + Gee.ArrayList keys = new Gee.ArrayList(); diff -Nru activity-log-manager-0.9.7/debian/patches/11_make_all_widgets_sensitive.patch activity-log-manager-0.9.7/debian/patches/11_make_all_widgets_sensitive.patch --- activity-log-manager-0.9.7/debian/patches/11_make_all_widgets_sensitive.patch 1970-01-01 00:00:00.000000000 +0000 +++ activity-log-manager-0.9.7/debian/patches/11_make_all_widgets_sensitive.patch 2014-03-25 12:55:36.000000000 +0000 @@ -0,0 +1,51 @@ +Description: Make all widgets sensitive, recursively +Author: Iain Lane + +Index: b/src/diagnostics-widget.c +=================================================================== +--- a/src/diagnostics-widget.c ++++ b/src/diagnostics-widget.c +@@ -100,6 +100,17 @@ + } + + static void ++gtk_widget_set_sensitive_recursive (GtkWidget *widget, ++ gpointer data) ++{ ++ gboolean allowed = *((gboolean *) data); ++ gtk_widget_set_sensitive (widget, allowed); ++ if (GTK_IS_CONTAINER (widget)) ++ gtk_container_foreach (GTK_CONTAINER (widget), ++ (GtkCallback)gtk_widget_set_sensitive_recursive, data); ++} ++ ++static void + on_permission_changed (GPermission* permission, GParamSpec* pspec, gpointer data) + { + gboolean allowed; +@@ -115,8 +126,12 @@ + 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); ++ gtk_container_foreach (GTK_CONTAINER (error_reports_box), ++ (GtkCallback)gtk_widget_set_sensitive_recursive, ++ &allowed); ++ gtk_container_foreach (GTK_CONTAINER (metrics_reports_box), ++ (GtkCallback)gtk_widget_set_sensitive_recursive, ++ &allowed); + } + + static void +@@ -237,9 +252,8 @@ + + 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); ++ g_signal_connect (priv->permission, "notify::allowed", G_CALLBACK (on_permission_changed), self); + on_permission_changed (priv->permission, NULL, self); + + whoopsie_daisy_preferences_setup_dbus (self, error); diff -Nru activity-log-manager-0.9.7/debian/patches/12_hide_lock_unlock_button.patch activity-log-manager-0.9.7/debian/patches/12_hide_lock_unlock_button.patch --- activity-log-manager-0.9.7/debian/patches/12_hide_lock_unlock_button.patch 1970-01-01 00:00:00.000000000 +0000 +++ activity-log-manager-0.9.7/debian/patches/12_hide_lock_unlock_button.patch 2014-03-25 12:56:46.000000000 +0000 @@ -0,0 +1,52 @@ +Description: Hide lock/unlock button when it doesn't do anything (when the user can't drop the privs) +Author: Iain Lane +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/activity-log-manager/+bug/1239752 + + +Index: b/data/whoopsie.ui +=================================================================== +--- a/data/whoopsie.ui ++++ b/data/whoopsie.ui +@@ -86,6 +86,7 @@ + + + ++ True + True + False + 1 +Index: b/src/diagnostics-widget.c +=================================================================== +--- a/src/diagnostics-widget.c ++++ b/src/diagnostics-widget.c +@@ -135,6 +135,17 @@ + } + + static void ++on_permission_changed_widget (GPermission *permission, GParamSpec *pspec, gpointer data) ++{ ++ GtkWidget *widget = GTK_WIDGET (data); ++ ++ if (g_permission_get_allowed (permission) && !g_permission_get_can_release (permission)) ++ gtk_widget_hide (widget); ++ else ++ gtk_widget_show (widget); ++} ++ ++static void + on_submit_error_reports_checked (GtkToggleButton* button, gpointer user_data) + { + WhoopsieDaisyPreferencesPrivate* priv = WHOOPSIE_DAISY_PREFERENCES (user_data)->priv; +@@ -254,7 +265,12 @@ + gtk_container_add (GTK_CONTAINER (unlock_align), GTK_WIDGET (unlock_button)); + + g_signal_connect (priv->permission, "notify::allowed", G_CALLBACK (on_permission_changed), self); ++ g_signal_connect (priv->permission, "notify::allowed", G_CALLBACK (on_permission_changed_widget), ++ unlock_button); ++ g_signal_connect (priv->permission, "notify::can-release", G_CALLBACK (on_permission_changed_widget), ++ unlock_button); + on_permission_changed (priv->permission, NULL, self); ++ on_permission_changed_widget (priv->permission, NULL, unlock_align); + + whoopsie_daisy_preferences_setup_dbus (self, error); + if (error) { diff -Nru activity-log-manager-0.9.7/debian/patches/13_hide_automatic_reports.patch activity-log-manager-0.9.7/debian/patches/13_hide_automatic_reports.patch --- activity-log-manager-0.9.7/debian/patches/13_hide_automatic_reports.patch 1970-01-01 00:00:00.000000000 +0000 +++ activity-log-manager-0.9.7/debian/patches/13_hide_automatic_reports.patch 2014-03-25 12:53:17.000000000 +0000 @@ -0,0 +1,32 @@ +Description: whoopsie doesn't implement this feature; hide the UI for it. +Author: Iain Lane + +Index: b/data/whoopsie.ui +=================================================================== +--- a/data/whoopsie.ui ++++ b/data/whoopsie.ui +@@ -165,24 +165,6 @@ + vertical + 3 + +- +- Send a report automatically if a problem prevents login +- False +- False +- False +- False +- False +- False +- 0 +- True +- +- +- False +- True +- 0 +- +- +- + + True + False diff -Nru activity-log-manager-0.9.7/debian/patches/14_seconds_combo.patch activity-log-manager-0.9.7/debian/patches/14_seconds_combo.patch --- activity-log-manager-0.9.7/debian/patches/14_seconds_combo.patch 1970-01-01 00:00:00.000000000 +0000 +++ activity-log-manager-0.9.7/debian/patches/14_seconds_combo.patch 2014-03-25 13:24:51.000000000 +0000 @@ -0,0 +1,58 @@ +Description: Unify the options between the 'brightness and lock' panel in g-c-c and alm and make them translatable +Author: Iain Lane + +Index: b/src/security-widget.vala +=================================================================== +--- a/src/security-widget.vala ++++ b/src/security-widget.vala +@@ -37,28 +37,41 @@ + this.set_up_ui (); + } + ++ private string get_time(int seconds) { ++ if (seconds >= 3600) { ++ int hours = seconds / 3600; ++ return ngettext("%u hour", "%u hours", hours).printf(hours); ++ } else if (seconds >= 60) { ++ int minutes = seconds / 60; ++ return ngettext("%u minute", "%u minutes", minutes).printf(minutes); ++ } else { ++ return ngettext("%u second", "%u seconds", seconds).printf(seconds); ++ } ++ } ++ + private void set_up_ui () { + + var liststore_delay = new ListStore (2, typeof (string), typeof (int)); + TreeIter iter; + liststore_delay.append (out iter); +- liststore_delay.set (iter, 0, "1 second", 1, 0); ++ liststore_delay.set (iter, 0, ngettext("0 second (lock immediately)", ++ "0 seconds (lock immediately)", 0), 1, 0); + liststore_delay.append (out iter); +- liststore_delay.set (iter, 0, "30 seconds", 1, 30); ++ liststore_delay.set (iter, 0, get_time(30), 1, 30); + liststore_delay.append (out iter); +- liststore_delay.set (iter, 0, "1 minute", 1, 60); ++ liststore_delay.set (iter, 0, get_time(60), 1, 60); + liststore_delay.append (out iter); +- liststore_delay.set (iter, 0, "2 minutes", 1, 120); ++ liststore_delay.set (iter, 0, get_time(120), 1, 120); + liststore_delay.append (out iter); +- liststore_delay.set (iter, 0, "3 minutes", 1, 180); ++ liststore_delay.set (iter, 0, get_time(180), 1, 180); + liststore_delay.append (out iter); +- liststore_delay.set (iter, 0, "5 minutes", 1, 300); ++ liststore_delay.set (iter, 0, get_time(300), 1, 300); + liststore_delay.append (out iter); +- liststore_delay.set (iter, 0, "10 minutes", 1, 600); ++ liststore_delay.set (iter, 0, get_time(600), 1, 600); + liststore_delay.append (out iter); +- liststore_delay.set (iter, 0, "30 minutes", 1, 1800); ++ liststore_delay.set (iter, 0, get_time(1800), 1, 1800); + liststore_delay.append (out iter); +- liststore_delay.set (iter, 0, "1 hour", 1, 3600); ++ liststore_delay.set (iter, 0, get_time(3600), 1, 3600); + + var grid = new Grid(); + grid.set_halign(Align.START); diff -Nru activity-log-manager-0.9.7/debian/patches/series activity-log-manager-0.9.7/debian/patches/series --- activity-log-manager-0.9.7/debian/patches/series 2014-03-24 15:19:30.000000000 +0000 +++ activity-log-manager-0.9.7/debian/patches/series 2014-03-25 13:24:33.000000000 +0000 @@ -1,4 +1,3 @@ -01_really_hide_automatic_reports.patch 02_dont_show_nonexistant_log_types.patch 03_use_libwhoopsie-preferences.patch 04_unity_control_center.patch @@ -7,4 +6,8 @@ 07_proxy_unref.patch 08_directory_icons.patch 09_security_spacing.patch -zero-seconds-text +14_seconds_combo.patch +10_build-with-gee-0.8.patch +11_make_all_widgets_sensitive.patch +12_hide_lock_unlock_button.patch +13_hide_automatic_reports.patch diff -Nru activity-log-manager-0.9.7/debian/patches/zero-seconds-text activity-log-manager-0.9.7/debian/patches/zero-seconds-text --- activity-log-manager-0.9.7/debian/patches/zero-seconds-text 2014-03-24 15:20:05.000000000 +0000 +++ activity-log-manager-0.9.7/debian/patches/zero-seconds-text 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Description: Unify the options between the 'brightness and lock' panel in g-c-c and alm -Author: Iain Lane - ---- activity-log-manager-0.9.7.orig/src/security-widget.vala -+++ activity-log-manager-0.9.7/src/security-widget.vala -@@ -42,7 +42,7 @@ namespace Alm { - var liststore_delay = new ListStore (2, typeof (string), typeof (int)); - TreeIter iter; - liststore_delay.append (out iter); -- liststore_delay.set (iter, 0, "1 second", 1, 0); -+ liststore_delay.set (iter, 0, "0 seconds (lock immediately)", 1, 0); - liststore_delay.append (out iter); - liststore_delay.set (iter, 0, "30 seconds", 1, 30); - liststore_delay.append (out iter);