[dia] Remove GLIB_CHECK_VERSION checks up to 2.6.0.



commit 6bb460023746bd657bcff7ddff0ee11d3e9dd27c
Author: Adam Buchbinder <adam buchbinder gmail com>
Date:   Tue Jul 28 16:16:39 2009 -0400

    Remove GLIB_CHECK_VERSION checks up to 2.6.0.
    
    We can do this because configure.in currently assumes >=2.12.
    
    Signed-off-by: Hans Breuer <hans breuer org>

 lib/dia_dirs.c |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)
---
diff --git a/lib/dia_dirs.c b/lib/dia_dirs.c
index 2cffc6f..ee3c614 100644
--- a/lib/dia_dirs.c
+++ b/lib/dia_dirs.c
@@ -229,21 +229,7 @@ dia_message_filename(const gchar *filename)
   gchar *tmp;
   GQuark msg_quark;
 
-#if GLIB_CHECK_VERSION(2,6,0)
   tmp = g_filename_display_name(filename);
-#else
-  gsize num_read;
-  tmp = g_filename_to_utf8(filename, -1, &num_read, NULL, NULL);
-  if (tmp == NULL) {
-    gchar *ellipsis;
-    /* Best effort at displaying filename: Display as must as is readable */
-    g_utf8_validate(filename, -1, &ellipsis);
-    tmp = g_filename_to_utf8(filename, ellipsis-filename, NULL, NULL, NULL);
-    ellipsis = g_strdup_printf(_("%s<illegal characters>..."), tmp);
-    g_free(tmp);
-    tmp = ellipsis;
-  }
-#endif
   /* Stick in the quark table so that we can return a static result
    */
   msg_quark = g_quark_from_string (tmp);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]