Merge lp:~kalikiana/midori/tautological into lp:midori

[Cris Dywan]

Fix tautological use of G_MAXINT with enum

Fix tautological use of G_MAXINT with enum

[gue5t gue5t (gue5t)]

The return value of midori_frontend_diagnostic_dialog should also be changed to gint, since the values it returns can be outside the range of the MidoriStartup enum. Otherwise looks good, nice to see this kind of subtle gotcha get fixed.

review: Needs Fixing

[lp:~kalikiana/midori/tautological]

6238. By Cris Dywan on 2013-06-30

Declare midori_frontend_diagnostic_dialog to return gint

[gue5t gue5t (gue5t)]

review: Approve

=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2013-06-19 20:27:53 +0000
+++ midori/midori-frontend.c	2013-06-30 15:01:25 +0000
@@ -316,7 +316,7 @@
     gtk_dialog_response (dialog, GTK_RESPONSE_HELP);
 }
 
-static MidoriStartup
+static gint
 midori_frontend_diagnostic_dialog (MidoriApp*         app,
                                    MidoriWebSettings* settings,
                                    KatzeArray*        session)
@@ -566,9 +566,10 @@
      && open_uris && !execute_commands)
      || diagnostic_dialog)
     {
-        load_on_startup = midori_frontend_diagnostic_dialog (app, settings, session);
-        if (load_on_startup == G_MAXINT)
+        gint response = midori_frontend_diagnostic_dialog (app, settings, session);
+        if (response == G_MAXINT)
             return NULL;
+        load_on_startup = response;
     }
     g_object_set_data (G_OBJECT (settings), "load-on-startup", GINT_TO_POINTER (load_on_startup));