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

Proposed by Allison Karlitskaya
Status: Merged
Approved by: Ted Gould
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) Approve
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.
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/datetime-prefs-locations.c'
--- src/datetime-prefs-locations.c 2012-01-09 13:06:50 +0000
+++ src/datetime-prefs-locations.c 2012-03-07 20:40:23 +0000
@@ -339,7 +339,7 @@
339{339{
340 gboolean empty = TRUE;340 gboolean empty = TRUE;
341 GVariantBuilder builder;341 GVariantBuilder builder;
342 g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);342 g_variant_builder_init (&builder, G_VARIANT_TYPE_STRING_ARRAY);
343343
344 GtkTreeIter iter;344 GtkTreeIter iter;
345 if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) {345 if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) {
346346
=== modified file 'src/datetime-service.c'
--- src/datetime-service.c 2012-03-03 19:45:25 +0000
+++ src/datetime-service.c 2012-03-07 20:40:23 +0000
@@ -830,7 +830,7 @@
830 }830 }
831 831
832 GVariantBuilder markeddays;832 GVariantBuilder markeddays;
833 g_variant_builder_init (&markeddays, G_VARIANT_TYPE_ARRAY);833 g_variant_builder_init (&markeddays, G_VARIANT_TYPE ("ai"));
834 834
835 i = 0;835 i = 0;
836 GList * cached_appointment = appointments;836 GList * cached_appointment = appointments;

Subscribers

People subscribed via source and target branches