debian/midori
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Conditionalize --snapshot on WebKitGTK+ 1.1.6

Browse source
This commit is contained in:
Christian Dywan 2009-05-05 23:02:45 +02:00
parent adec655c01
commit 902e75fb77
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
midori/main.c
View file

@ -1345,6 +1345,7 @@ midori_run_script (const gchar* filename)
return 1; return 1;
} }
#if WEBKIT_CHECK_VERSION (1, 1, 6)
static void static void
snapshot_load_finished_cb (GtkWidget* web_view, snapshot_load_finished_cb (GtkWidget* web_view,
WebKitWebFrame* web_frame, WebKitWebFrame* web_frame,
@ -1369,6 +1370,7 @@ snapshot_load_finished_cb (GtkWidget* web_view,
g_print (_("Snapshot saved to: %s\n"), filename); g_print (_("Snapshot saved to: %s\n"), filename);
gtk_main_quit (); gtk_main_quit ();
} }
#endif
int int
main (int argc, main (int argc,
@ -1391,8 +1393,10 @@ main (int argc,
N_("Use FOLDER as configuration folder"), N_("FOLDER") }, N_("Use FOLDER as configuration folder"), N_("FOLDER") },
{ "run", 'r', 0, G_OPTION_ARG_NONE, &run, { "run", 'r', 0, G_OPTION_ARG_NONE, &run,
N_("Run the specified filename as javascript"), NULL }, N_("Run the specified filename as javascript"), NULL },
#if WEBKIT_CHECK_VERSION (1, 1, 6)
{ "snapshot", 's', 0, G_OPTION_ARG_STRING, &snapshot, { "snapshot", 's', 0, G_OPTION_ARG_STRING, &snapshot,
N_("Take a snapshot of the specified URI"), NULL }, N_("Take a snapshot of the specified URI"), NULL },
#endif
{ "version", 'V', 0, G_OPTION_ARG_NONE, &version, { "version", 'V', 0, G_OPTION_ARG_NONE, &version,
N_("Display program version"), NULL }, N_("Display program version"), NULL },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris,
@ -1469,6 +1473,7 @@ main (int argc,
return 0; return 0;
} }
#if WEBKIT_CHECK_VERSION (1, 1, 6)
if (snapshot) if (snapshot)
{ {
GError *error; GError *error;
@ -1500,6 +1505,7 @@ main (int argc,
g_free (filename); g_free (filename);
return 0; return 0;
} }
#endif
/* Web Application support */ /* Web Application support */
if (webapp) if (webapp)