Indicator Date and Time

Merge lp:~desrt/indicator-datetime/gvariantbuilder into lp:indicator-datetime/0.4

  1. gvariantbuilder
  2. Merge into trunk.0.4
Proposed by Allison Lortie on 2012-03-07
Status: Merged
Approved by: Ted Gould on 2012-03-07
Approved revision: 159
Merged at revision: 159
Proposed branch: lp:~desrt/indicator-datetime/gvariantbuilder
Merge into: lp:indicator-datetime/0.4
Diff against target: 25 lines (+2/-2)
2 files modified
src/datetime-prefs-locations.c (+1/-1)
src/datetime-service.c (+1/-1)
To merge this branch: bzr merge lp:~desrt/indicator-datetime/gvariantbuilder
Reviewer Review Type Date Requested Status
Ted Gould (community) 2012-03-07 Approve on 2012-03-07
Review via email: mp+96451@code.launchpad.net

Description of the Change

fix GVariantBuilder use in the datetime indicator

To post a comment you must log in.
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/datetime-prefs-locations.c'
2--- src/datetime-prefs-locations.c 2012-01-09 13:06:50 +0000
3+++ src/datetime-prefs-locations.c 2012-03-07 20:40:23 +0000
4@@ -339,7 +339,7 @@
5 {
6 gboolean empty = TRUE;
7 GVariantBuilder builder;
8- g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
9+ g_variant_builder_init (&builder, G_VARIANT_TYPE_STRING_ARRAY);
10
11 GtkTreeIter iter;
12 if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) {
13
14=== modified file 'src/datetime-service.c'
15--- src/datetime-service.c 2012-03-03 19:45:25 +0000
16+++ src/datetime-service.c 2012-03-07 20:40:23 +0000
17@@ -830,7 +830,7 @@
18 }
19
20 GVariantBuilder markeddays;
21- g_variant_builder_init (&markeddays, G_VARIANT_TYPE_ARRAY);
22+ g_variant_builder_init (&markeddays, G_VARIANT_TYPE ("ai"));
23
24 i = 0;
25 GList * cached_appointment = appointments;

Subscribers

People subscribed via source and target branches