summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Dywan <christian.dywan@canonical.com>2013-07-02 08:20:31 +0000
committerTarmac <>2013-07-02 08:20:31 +0000
commit48eb18cb400fd698384d4a7d72cb73cc17ea6ea5 (patch)
tree9209fb570520a92c9afcbccd990753eef41e5d3d
parentfda1f9ff25f35f9ae9570e733696ce8f2c2cd696 (diff)
parent274511eb0d2387f44d798072f5e74993a5186f88 (diff)
downloadmidori-48eb18cb400fd698384d4a7d72cb73cc17ea6ea5.tar.gz
Fix tautological use of G_MAXINT with enum
-rw-r--r--midori/midori-frontend.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/midori/midori-frontend.c b/midori/midori-frontend.c
index 9dcd692c..8b941fb7 100644
--- a/midori/midori-frontend.c
+++ b/midori/midori-frontend.c
@@ -316,7 +316,7 @@ midori_frontend_debugger_cb (GtkWidget* button,
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 @@ midori_normal_app_new (const gchar* config,
&& 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));