Merge lp:~tuxator/midori/glib-bump into lp:midori

[Paweł Forysiuk]

Bump glib2 version to 2.32.4

[Cris Dywan (kalikiana)]

Looks decent.

review: Approve

=== modified file 'extensions/cookie-manager/cookie-manager-page.c'
--- extensions/cookie-manager/cookie-manager-page.c	2013-06-21 23:18:01 +0000
+++ extensions/cookie-manager/cookie-manager-page.c	2013-06-26 21:57:40 +0000
@@ -660,17 +660,9 @@
 	if (cookie->expires != NULL)
 	{
 		time_t expiration_time = soup_date_to_time_t(cookie->expires);
-		#if GLIB_CHECK_VERSION (2, 26, 0)
 		GDateTime* date = g_date_time_new_from_unix_local(expiration_time);
 		expires = g_date_time_format(date, "%c");
 		g_date_time_unref(date);
-		#else
-		static gchar date_fmt[512];
-		const struct tm *tm = localtime(&expiration_time);
-		/* Some GCC versions falsely complain about "%c" */
-		strftime(date_fmt, sizeof(date_fmt), "%c", tm);
-		expires = g_strdup(date_fmt);
-		#endif
 	}
 	else
 		expires = g_strdup(_("At the end of the session"));
 
=== modified file 'extensions/feed-panel/feed-panel.c'
--- extensions/feed-panel/feed-panel.c	2013-06-21 23:18:01 +0000
+++ extensions/feed-panel/feed-panel.c	2013-06-26 21:57:40 +0000
@@ -359,17 +359,9 @@
                 g_assert (KATZE_IS_ARRAY (parent));
                 if (added)
                 {
-                    #if GLIB_CHECK_VERSION (2, 26, 0)
                     GDateTime* date = g_date_time_new_from_unix_local (added);
                     gchar* pretty = g_date_time_format (date, "%c");
                     g_date_time_unref (date);
-                    #else
-                    static gchar date_fmt[512];
-                    const struct tm *tm = localtime (&added);
-                    /* Some GCC versions falsely complain about "%c" */
-                    strftime (date_fmt, sizeof (date_fmt), "%c", tm);
-                    gchar* pretty = g_strdup (date_fmt);
-                    #endif
 
     /* i18n: The local date a feed was last updated */
                     gchar* last_updated = g_strdup_printf (C_("Feed", "Last updated: %s."), pretty);
 
=== modified file 'extensions/status-clock.c'
--- extensions/status-clock.c	2012-12-05 20:12:30 +0000
+++ extensions/status-clock.c	2013-06-26 21:57:40 +0000
@@ -48,21 +48,12 @@
     GtkWidget* label = g_object_get_data (G_OBJECT (browser), "clock-label");
     const gchar* format = midori_extension_get_string (extension, "format");
 
-    #if GLIB_CHECK_VERSION (2, 26, 0)
     GDateTime* date = g_date_time_new_now_local ();
     gint seconds = g_date_time_get_seconds (date);
     gchar* pretty = g_date_time_format (date, format);
     gtk_label_set_label (GTK_LABEL (label), pretty);
     g_free (pretty);
     g_date_time_unref (date);
-    #else
-    time_t rawtime = time (NULL);
-    struct tm *tm = localtime (&rawtime);
-    gint seconds = tm->tm_sec;
-    char date_fmt[512];
-    strftime (date_fmt, sizeof (date_fmt), format, tm);
-    gtk_label_set_label (GTK_LABEL (label), date_fmt);
-    #endif
 
     if (g_strstr_len (format, -1, "%c")
      || g_strstr_len (format, -1, "%N")
 
=== modified file 'katze/gtk3-compat.h'
--- katze/gtk3-compat.h	2013-06-20 21:19:42 +0000
+++ katze/gtk3-compat.h	2013-06-26 21:57:40 +0000
@@ -41,15 +41,6 @@
         gtk_widget_get_preferred_size(wdgt, req, NULL)
 #endif
 
-#if !GLIB_CHECK_VERSION (2, 32, 0)
-    #define G_SOURCE_REMOVE   FALSE
-    #define G_SOURCE_CONTINUE TRUE
-#endif
-
-#if !GLIB_CHECK_VERSION (2, 30, 0)
-    #define g_format_size(sz) g_format_size_for_display ((goffset)sz)
-#endif
-
 #if GTK_CHECK_VERSION (3, 0, 0)
     #define GTK_DIALOG_NO_SEPARATOR 0
 #endif
 
=== modified file 'katze/midori-paths.vala'
--- katze/midori-paths.vala	2013-06-19 20:27:53 +0000
+++ katze/midori-paths.vala	2013-06-26 21:57:40 +0000
@@ -272,18 +272,12 @@
 
         public static string make_tmp_dir (string tmpl) {
             assert (tmp_dir != null);
-#if HAVE_GLIB_2_30
             try {
                 return DirUtils.make_tmp (tmpl);
             }
             catch (Error error) {
                 GLib.error (error.message);
             }
-#else
-            string folder = Path.build_path (Path.DIR_SEPARATOR_S, Environment.get_tmp_dir (), tmpl);
-            DirUtils.mkdtemp (folder);
-            return folder;
-#endif
         }
 
         public static void init_exec_path (string[] new_command_line) {
 
=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2013-05-30 11:08:14 +0000
+++ midori/midori-app.c	2013-06-26 21:57:40 +0000
@@ -1371,12 +1371,6 @@
     }
     #endif
 
-    /* libSoup uses threads, therefore if WebKit is built with libSoup
-     * or Midori is using it, we need to initialize threads. */
-    #if !GLIB_CHECK_VERSION (2, 32, 0)
-    if (!g_thread_supported ()) g_thread_init (NULL);
-    #endif
-
     /* Midori.Paths uses GFile */
     g_type_init ();
     /* Preserve argument vector */
 
=== modified file 'midori/midori-download.vala'
--- midori/midori-download.vala	2013-06-03 22:48:08 +0000
+++ midori/midori-download.vala	2013-06-26 21:57:40 +0000
@@ -50,12 +50,6 @@
 #endif
         }
 
-#if !HAVE_GLIB_2_30
-        private static string format_size (uint64 size) {
-            return format_size_for_display ((int64)size);
-        }
-#endif
-
         public static string get_tooltip (WebKit.Download download) {
 #if !HAVE_WEBKIT2
             string filename = Path.get_basename (download.destination_uri);
 
=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2013-06-19 20:24:37 +0000
+++ midori/midori-preferences.c	2013-06-26 21:57:40 +0000
@@ -484,7 +484,6 @@
     g_signal_connect (settings, "notify::proxy-type",
         G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry);
     midori_preferences_notify_proxy_type_cb (settings, NULL, entry);
-    #if GLIB_CHECK_VERSION (2, 26, 0)
     INDENTED_ADD (gtk_event_box_new ());
     label = gtk_label_new (NULL);
     GString* proxy_types = g_string_new (NULL);
@@ -504,7 +503,6 @@
     g_signal_connect (settings, "notify::proxy-type",
         G_CALLBACK (midori_preferences_notify_proxy_type_cb), label);
     midori_preferences_notify_proxy_type_cb (settings, NULL, label);
-    #endif
 #ifndef HAVE_WEBKIT2
     if (soup_session_get_feature (webkit_get_default_session (), SOUP_TYPE_CACHE))
     {
 
=== modified file 'midori/sokoke.c'
--- midori/sokoke.c	2013-06-21 20:49:53 +0000
+++ midori/sokoke.c	2013-06-26 21:57:40 +0000
@@ -148,14 +148,6 @@
         return NULL;
 
     info = g_app_info_get_default_for_uri_scheme (scheme);
-    #if !GLIB_CHECK_VERSION (2, 28, 0)
-    if (!info)
-    {
-        gchar* type = g_strdup_printf ("x-scheme-handler/%s", scheme);
-        info = g_app_info_get_default_for_type (type, FALSE);
-        g_free (type);
-    }
-    #endif
     if (scheme_ptr != NULL)
         *scheme_ptr = scheme;
     else
@@ -191,10 +183,6 @@
     return ShellExecuteEx (&info);
     #else
 
-    #if !GLIB_CHECK_VERSION (2, 28, 0)
-    GAppInfo* info;
-    gchar* scheme;
-    #endif
     GtkWidget* dialog;
     GtkWidget* box;
     gchar* filename;
@@ -211,25 +199,6 @@
     if (gtk_show_uri (screen, uri, timestamp, error))
         return TRUE;
 
-    #if !GLIB_CHECK_VERSION (2, 28, 0)
-    info = sokoke_default_for_uri (uri, &scheme);
-    if (info)
-    {
-        gchar* argument = g_strdup (&uri[scheme - uri]);
-        GList* uris = g_list_prepend (NULL, argument);
-        if (g_app_info_launch_uris (info, uris, NULL, NULL))
-        {
-            g_list_free (uris);
-            g_free (scheme);
-            g_object_unref (info);
-            return TRUE;
-        }
-        g_list_free (uris);
-        g_free (scheme);
-        g_object_unref (info);
-    }
-    #endif
-
     {
         gchar* command = g_strconcat ("xdg-open ", uri, NULL);
         gboolean result = g_spawn_command_line_async (command, error);
 
=== modified file 'panels/midori-history.c'
--- panels/midori-history.c	2013-06-21 23:18:01 +0000
+++ panels/midori-history.c	2013-06-26 21:57:40 +0000
@@ -117,37 +117,12 @@
     return STOCK_HISTORY;
 }
 
-#if !GLIB_CHECK_VERSION (2, 26, 0)
-static gint
-sokoke_days_between (const time_t* day1,
-                     const time_t* day2)
-{
-    GDate* date1;
-    GDate* date2;
-    gint age;
-
-    date1 = g_date_new ();
-    date2 = g_date_new ();
-
-    g_date_set_time_t (date1, *day1);
-    g_date_set_time_t (date2, *day2);
-
-    age = g_date_days_between (date1, date2);
-
-    g_date_free (date1);
-    g_date_free (date2);
-
-    return age;
-}
-#endif
-
 static gchar*
 midori_history_format_date (KatzeItem *item)
 {
     gint64 day = katze_item_get_added (item);
     gchar* sdate;
     gint age;
-    #if GLIB_CHECK_VERSION (2, 26, 0)
     GDateTime* now = g_date_time_new_now_local ();
     GDateTime* then = g_date_time_new_from_unix_local (day);
     age = g_date_time_get_day_of_year (now) - g_date_time_get_day_of_year (then);
@@ -167,31 +142,7 @@
         sdate = g_date_time_format (then, "%x");
     g_date_time_unref (now);
     g_date_time_unref (then);
-    #else
-    gchar token[50];
-    time_t current_time;
-
-    current_time = time (NULL);
-    age = sokoke_days_between ((time_t*)&day, &current_time);
-
-    /* A negative age is a date in the future, the clock is probably off */
-    if (age < -1)
-        sdate = g_strdup ("");
-    else if (age > 7 || age < 0)
-    {
-        strftime (token, sizeof (token), "%x", localtime ((time_t*)&day));
-        sdate = g_strdup (token);
-    }
-    else if (age > 6)
-        sdate = g_strdup (_("A week ago"));
-    else if (age > 1)
-        sdate = g_strdup_printf (ngettext ("%d day ago",
-            "%d days ago", (gint)age), (gint)age);
-    else if (age == 0)
-        sdate = g_strdup (_("Today"));
-    else
-        sdate = g_strdup (_("Yesterday"));
-    #endif
+
     return sdate;
 }
 
@@ -466,7 +417,6 @@
         gtk_tree_model_get (model, &iter, 0, &today, -1);
 
         day = katze_item_get_added (today);
-        #if GLIB_CHECK_VERSION (2, 26, 0)
         has_today = g_date_time_get_day_of_month (
             g_date_time_new_from_unix_local (day))
          == g_date_time_get_day_of_month (
@@ -475,10 +425,8 @@
             g_date_time_new_from_unix_local (day))
          == g_date_time_get_day_of_year (
             g_date_time_new_from_unix_local (current_time));
-        #else
-        has_today = sokoke_days_between ((time_t*)&day, &current_time) == 0;
-        #endif
         g_object_unref (today);
+
         if (has_today)
         {
             gchar* tooltip = g_markup_escape_text (katze_item_get_uri (item), -1);
 
=== modified file 'wscript'
--- wscript	2013-06-22 19:53:16 +0000
+++ wscript	2013-06-26 21:57:40 +0000
@@ -219,11 +219,7 @@
 
     conf.check (lib='m')
     check_pkg ('gmodule-2.0')
-    check_pkg ('gio-2.0', '2.22.0')
-    if check_version (conf.env['GIO_VERSION'], 2, 30, 0) \
-        and check_version (conf.env['VALAC_VERSION'], 0, 16, 0):
-        # Older Vala doesn't have GLib 2.30 bindings
-        conf.env.append_value ('VALAFLAGS', '-D HAVE_GLIB_2_30')
+    check_pkg ('gio-2.0', '2.32.4')
 
     args = ''
     if Options.platform == 'win32':
@@ -302,10 +298,6 @@
     conf.env['docs'] = option_enabled ('docs')
     if 'LINGUAS' in os.environ: conf.env['LINGUAS'] = os.environ['LINGUAS']
 
-    if not check_version (conf.env['GIO_VERSION'], 2, 26, 0):
-        conf.env['addons'] = False
-        Utils.pprint ('YELLOW', 'Glib < 2.26.0, disabling addons')
-
     conf.check (header_name='unistd.h')
     if not conf.env['HAVE_UNIQUE']:
         if Options.platform == 'win32':
@@ -366,13 +358,6 @@
         Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.')
         Utils.pprint ('RED', 'Please use an older or newer version.')
         sys.exit (1)
-    if check_version (conf.env['LIBSOUP_VERSION'], 2, 33, 4) \
-        and check_version (conf.env['GIO_VERSION'], 2, 32, 1) \
-        and not check_version (conf.env['GIO_VERSION'], 2, 32, 3):
-        Utils.pprint ('RED', 'libsoup >= 2.33.4 found with glib >= 2.32.1 < 2.32.3:')
-        Utils.pprint ('RED', 'This combination breaks the download GUI.')
-        Utils.pprint ('RED', 'See https://bugs.launchpad.net/midori/+bug/780133/comments/14')
-        sys.exit (1)
 
 def set_options (opt):
     def add_enable_option (option, desc, group=None, disable=False):