← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~charlesk/indicator-datetime/refix-844741 into lp:indicator-datetime

 

charles has proposed merging lp:~charlesk/indicator-datetime/refix-844741 into lp:indicator-datetime.

Requested reviews:
  Lars Uebernickel (larsu)
Related bugs:
  Bug #844741 in Indicator Date and Time: "gnome-control-center crashed with SIGABRT in raise()"
  https://bugs.launchpad.net/indicator-datetime/+bug/844741

For more details, see:
https://code.launchpad.net/~charlesk/indicator-datetime/refix-844741/+merge/93245
-- 
https://code.launchpad.net/~charlesk/indicator-datetime/refix-844741/+merge/93245
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.
=== modified file 'src/timezone-completion.c'
--- src/timezone-completion.c	2011-09-06 12:47:37 +0000
+++ src/timezone-completion.c	2012-02-15 16:58:19 +0000
@@ -311,7 +311,7 @@
   return locale;
 }
 
-static gchar *
+static const gchar *
 get_version (void)
 {
   static gchar *version = NULL;
@@ -351,11 +351,10 @@
   priv->request_text = g_strdup (text);
 
   gchar * escaped = g_uri_escape_string (text, NULL, FALSE);
-  gchar * version = get_version ();
+  const gchar * version = get_version ();
   gchar * locale = get_locale ();
   gchar * url = g_strdup_printf (GEONAME_URL, escaped, version, locale);
   g_free (locale);
-  g_free (version);
   g_free (escaped);
 
   GFile * file =  g_file_new_for_uri (url);


Follow ups