[glide] Ever closer to working new animations

[Robert Carr <racarr src gnome org>]

commit cff534358160f78716b7e3cb0978776f8113773a
Author: Robert Carr <racarr Valentine localdomain>
Date:   Tue Apr 27 04:37:18 2010 -0400

    Ever closer to working new animations

 src/glide-json-util.c |    5 ++++-
 src/glide-window.c    |    3 +++
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/src/glide-json-util.c b/src/glide-json-util.c
index 9c5b591..f63d28b 100644
--- a/src/glide-json-util.c
+++ b/src/glide-json-util.c
@@ -77,7 +77,10 @@ glide_json_object_set_animation (JsonObject *obj,
     {
       glide_json_object_set_string (animation_obj, "name", info->animation->name);
       glide_json_object_set_double (animation_obj, "duration", info->duration);
-      glide_json_object_set_string (animation_obj, "option", info->option);
+      if (info->option)
+	glide_json_object_set_string (animation_obj, "option", info->option);
+      else
+	glide_json_object_set_string (animation_obj, "option", "None");
     }
   else
     {
diff --git a/src/glide-window.c b/src/glide-window.c
index bf16eb8..f729112 100644
--- a/src/glide-window.c
+++ b/src/glide-window.c
@@ -761,6 +761,9 @@ glide_window_update_animation_options_box (GlideWindow *w,
       gtk_list_store_set (store, &iter, 0, option,
 			  -1);
     }
+  
+  gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter);
+  gtk_combo_box_set_active_iter (c, &iter);
 
   glide_animation_manager_free_options (options);