From: Emmanuel Rodriguez <emmanuel.rodriguez@gmail.com>
Date: Tue, 21 Apr 2009 05:36:03 +0000 (+0200)
Subject: Made all references to the word "license" consistent in the file.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0731a16f788e02aa7a7c8180f26dba3eb045b38;p=libchamplain

Made all references to the word "license" consistent in the file.
---

diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index 2f73a2c..18702a7 100644
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -134,7 +134,7 @@ struct _ChamplainViewPrivate
   Map *map; /* Contains the current map model */
 
   ClutterActor *finger_scroll; /* Contains the viewport */
-  ClutterActor *viewport;  /* Contains the map_layer, licence and markers */
+  ClutterActor *viewport;  /* Contains the map_layer, license and markers */
   ClutterActor *map_layer; /* Contains tiles actors (grouped by zoom level) */
   ChamplainRectangle viewport_size;
 
@@ -145,7 +145,7 @@ struct _ChamplainViewPrivate
   gboolean zoom_on_double_click;
 
   gboolean show_license;
-  ClutterActor *license_actor; /* Contains the licence info */
+  ClutterActor *license_actor; /* Contains the license info */
 
   ChamplainState state; /* View's global state */
 
@@ -521,9 +521,9 @@ champlain_view_dispose (GObject *object)
 {
   ChamplainView *view = CHAMPLAIN_VIEW (object);
   ChamplainViewPrivate *priv = view->priv;
-
   g_object_unref (priv->map_source);
-  g_object_unref (priv->license_actor);
+  if (priv->license_actor)
+    g_object_unref (priv->license_actor);
   g_object_unref (priv->finger_scroll);
   g_object_unref (priv->viewport);
   g_object_unref (priv->map_layer);
@@ -909,6 +909,7 @@ update_license (ChamplainView *view)
     g_object_unref (priv->license_actor);
     clutter_container_remove_actor (CLUTTER_CONTAINER (priv->stage),
         priv->license_actor);
+    priv->license_actor = NULL;
   }
 
   if (priv->show_license)