Use elevation values in creating waypoints from Wikipedia.

[andy/viking.git] / src / uibuilder.c

diff --git a/src/uibuilder.c b/src/uibuilder.c
index ff7557378a6e4a7cb1608afd1783a3b5fafa1868..9eec9b3106561c2a1d2fc339e1db20d23bd213c9 100644 (file)
--- a/src/uibuilder.c
+++ b/src/uibuilder.c
@@ -143,10 +143,8 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data
         gtk_entry_set_visibility ( GTK_ENTRY(rv), FALSE );
         if (data.s)
           gtk_entry_set_text ( GTK_ENTRY(rv), data.s );
-#if GTK_CHECK_VERSION(2,12,0)
-       gtk_widget_set_tooltip_text ( GTK_WIDGET(rv),
-                                     _("Take care that this password will be stored clearly in a plain file.") );
-#endif
+        gtk_widget_set_tooltip_text ( GTK_WIDGET(rv),
+                                     _("Take care that this password will be stored clearly in a plain file.") );
       }
       break;
     case VIK_LAYER_WIDGET_FILEENTRY:
@@ -182,6 +180,10 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data
         gtk_range_set_value ( GTK_RANGE(rv), init_val );
       }
   }
+  if ( rv && !gtk_widget_get_tooltip_text ( rv ) ) {
+    if ( param->tooltip )
+      gtk_widget_set_tooltip_text ( rv, _(param->tooltip) );
+  }
   return rv;
 }
 
@@ -360,6 +362,8 @@ gint a_uibuilder_properties_factory ( const gchar *dialog_name, GtkWindow *paren
 
       gtk_widget_destroy ( dialog ); /* hide before redrawing. */
       g_free ( widgets );
+      if ( tables )
+        g_free ( tables );
 
       return must_redraw ? 2 : 3; /* user clicked OK */
     }