activity-log-manager/trunk/fix-build.patch

   1 diff -Naur activity-log-manager-0.9.7.orig/src/blacklist-dbus.vala activity-log-manager-0.9.7/src/blacklist-dbus.vala
   2 --- activity-log-manager-0.9.7.orig/src/blacklist-dbus.vala     2015-07-17 02:38:04.290396888 +0000
   3 +++ activity-log-manager-0.9.7/src/blacklist-dbus.vala  2015-07-17 02:38:33.883637191 +0000
   4 @@ -137,7 +137,7 @@
   5                         return false;
   6                 }
   7
   8 -               public async void find_events (string id, TreeIter iter, ListStore store)
   9 +               public async void find_events (string id, TreeIter iter, Gtk.ListStore store)
  10                 {
  11                 Event event = new Event();
  12                 event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
  13 @@ -165,7 +165,7 @@
  14                         store.set_value(iter, 5, counter);
  15                 }
  16
  17 -               public void get_count_for_app (string app_id, TreeIter iter, ListStore store) {
  18 +               public void get_count_for_app (string app_id, TreeIter iter, Gtk.ListStore store) {
  19                         find_events(app_id, iter, store);
  20                 }
  21
  22 diff -Naur activity-log-manager-0.9.7.orig/src/security-widget.vala activity-log-manager-0.9.7/src/security-widget.vala
  23 --- activity-log-manager-0.9.7.orig/src/security-widget.vala    2015-07-17 02:38:04.290396888 +0000
  24 +++ activity-log-manager-0.9.7/src/security-widget.vala 2015-07-17 02:38:33.950303649 +0000
  25 @@ -39,7 +39,7 @@
  26
  27                 private void set_up_ui () {
  28
  29 -                       var liststore_delay = new ListStore (2, typeof (string), typeof (int));
  30 +                       var liststore_delay = new Gtk.ListStore (2, typeof (string), typeof (int));
  31                         TreeIter iter;
  32                         liststore_delay.append (out iter);
  33                         liststore_delay.set (iter, 0, "1 second", 1, 0);
  34 diff -Naur activity-log-manager-0.9.7.orig/src/unified-privacy-applications.vala activity-log-manager-0.9.7/src/unified-privacy-applications.vala
  35 --- activity-log-manager-0.9.7.orig/src/unified-privacy-applications.vala       2015-07-17 02:38:04.290396888 +0000
  36 +++ activity-log-manager-0.9.7/src/unified-privacy-applications.vala    2015-07-17 02:38:33.936970357 +0000
  37 @@ -60,7 +60,7 @@
  38                         }
  39                 }
  40
  41 -               public void get_count_for_app(string id, TreeIter iter, ListStore store) {
  42 +               public void get_count_for_app(string id, TreeIter iter, Gtk.ListStore store) {
  43                         this.blacklist_interface.get_count_for_app(id, iter, store);
  44                 }
  45
  46 @@ -131,7 +131,7 @@
  47         private class ApplicationsTreeView : Gtk.Box {
  48
  49                 private ApplicationBlacklist app_blacklist;
  50 -               private ListStore store;
  51 +               private Gtk.ListStore store;
  52                 private TreeView treeview;
  53
  54                 HashTable<string, AppChooseInfo> blocked_apps;
  55 @@ -145,7 +145,7 @@
  56                         N_COLS
  57                 }
  58
  59 -               public ListStore liststore {
  60 +               public Gtk.ListStore liststore {
  61                         get {
  62                                 return this.store;
  63                         }
  64 @@ -160,7 +160,7 @@
  65                         this.blocked_apps = blocked;
  66                         this.unblocked_apps = unblocked;
  67
  68 -                       this.store = new ListStore (TreeViewCols.N_COLS,
  69 +                       this.store = new Gtk.ListStore (TreeViewCols.N_COLS,
  70                                                                                 typeof (string),
  71                                                                                 typeof (Gdk.Pixbuf),
  72                                                                                 typeof (string));
  73 @@ -292,7 +292,7 @@
  74         private class AppSelectionTreeView : Gtk.Box {
  75
  76                 private ApplicationBlacklist app_blacklist;
  77 -               private ListStore store;
  78 +               private Gtk.ListStore store;
  79                 private TreeView treeview;
  80
  81                 enum TreeViewCols
  82 @@ -312,7 +312,7 @@
  83                         }
  84                 }
  85
  86 -               public ListStore liststore {
  87 +               public Gtk.ListStore liststore {
  88                         get {
  89                                 return store;
  90                         }
  91 @@ -323,7 +323,7 @@
  92
  93                         this.app_blacklist = app_blacklist;
  94
  95 -                       this.store = new ListStore (TreeViewCols.N_COLS,
  96 +                       this.store = new Gtk.ListStore (TreeViewCols.N_COLS,
  97                                                                                 typeof (string),
  98                                                                                 typeof (Gdk.Pixbuf),
  99                                                                                 typeof (string),
 100 @@ -426,7 +426,7 @@
 101                         }
 102                 }
 103
 104 -               public ListStore liststore {
 105 +               public Gtk.ListStore liststore {
 106                         get {
 107                                 return treeview.liststore;
 108                         }
 109 diff -Naur activity-log-manager-0.9.7.orig/src/unified-privacy.vala activity-log-manager-0.9.7/src/unified-privacy.vala
 110 --- activity-log-manager-0.9.7.orig/src/unified-privacy.vala    2015-07-17 02:38:04.290396888 +0000
 111 +++ activity-log-manager-0.9.7/src/unified-privacy.vala 2015-07-17 02:38:33.886970514 +0000
 112 @@ -55,7 +55,7 @@
 113
 114                 //General stuffs
 115                 private TreeView exception_list;
 116 -               private ListStore exception_list_store;
 117 +               private Gtk.ListStore exception_list_store;
 118
 119                 private Switch record_button;
 120
 121 @@ -262,7 +262,7 @@
 122                         exception_vbox.pack_start (al2, false, false, 5);
 123
 124                         // Exception TreeView
 125 -                       this.exception_list_store = new ListStore (4,
 126 +                       this.exception_list_store = new Gtk.ListStore (4,
 127                                 typeof(string),      // Full file path of application desktop file.
 128                                 typeof(Gdk.Pixbuf?), // Pixbuf
 129                                 typeof(string),      // File basename or ApplicationName
 130 @@ -291,7 +291,7 @@
 131                         // Add/Remove buttons
 132                         var exception_toolbar = new Toolbar();
 133                         exception_toolbar.toolbar_style = ToolbarStyle.ICONS;
 134 -                       exception_toolbar.icon_size = 1;
 135 +                       exception_toolbar.icon_size = Gtk.IconSize.MENU;
 136                         exception_toolbar.icon_size_set = true;
 137                         exception_toolbar.visible = true;
 138