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

Drop WebKit and libSoup version conditionals in WebSettings

Browse source
This commit is contained in:
Christian Dywan 2009-03-16 02:05:45 +01:00
parent b40c7b0f87
commit 424cca0b66
1 changed files with 15 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
midori/midori-websettings.c
View file

@ -593,8 +593,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Where to open new pages"), _("Where to open new pages"),
MIDORI_TYPE_NEW_PAGE, MIDORI_TYPE_NEW_PAGE,
MIDORI_NEW_PAGE_TAB, MIDORI_NEW_PAGE_TAB,
(g_signal_lookup ("create-web-view", WEBKIT_TYPE_WEB_VIEW) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
? G_PARAM_READWRITE : G_PARAM_READABLE) | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_OPEN_EXTERNAL_PAGES_IN, PROP_OPEN_EXTERNAL_PAGES_IN,
@ -647,58 +646,21 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
if (!g_object_class_find_property (gobject_class, "enforce-96-dpi"))
/** /**
* MidoriWebSettings:enforce-96-dpi: * MidoriWebSettings:zoom-text-and-images:
* *
* Whether to enforce a resolution of 96 DPI. * Whether to zoom text and images.
* *
* Since: 0.1.2 * Since: 0.1.3
*/ */
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_ENFORCE_96_DPI, PROP_ZOOM_TEXT_AND_IMAGES,
g_param_spec_boolean ( g_param_spec_boolean (
"enforce-96-dpi", "zoom-text-and-images",
"Enforce 96 DPI", _("Zoom Text and Images"),
"Whether to enforce a resolution of 96 DPI", _("Whether to zoom text and images"),
FALSE, FALSE,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
if (!g_object_class_find_property (gobject_class, "enable-developer-extras"))
/**
* MidoriWebSettings:enable-developer-extras:
*
* Whether to enable extra developer tools.
*
* Since: 0.1.2
*/
g_object_class_install_property (gobject_class,
PROP_ENABLE_DEVELOPER_EXTRAS,
g_param_spec_boolean (
"enable-developer-extras",
"Enable Developer Extras",
"Whether to enable extra developer tools",
FALSE,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
if (!g_object_class_find_property (gobject_class, "zoom-text-and-images"))
/**
* MidoriWebSettings:zoom-text-and-images:
*
* Whether to zoom text and images.
*
* Since: 0.1.3
*/
g_object_class_install_property (gobject_class,
PROP_ZOOM_TEXT_AND_IMAGES,
g_param_spec_boolean (
"zoom-text-and-images",
_("Zoom Text and Images"),
_("Whether to zoom text and images"),
FALSE,
(g_object_class_find_property (g_type_class_ref (WEBKIT_TYPE_WEB_VIEW),
"full-content-zoom") ? G_PARAM_READWRITE : G_PARAM_READABLE)
| G_PARAM_STATIC_STRINGS));
/** /**
* MidoriWebSettings:find-while-typing: * MidoriWebSettings:find-while-typing:
@ -724,11 +686,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("What type of cookies to accept"), _("What type of cookies to accept"),
MIDORI_TYPE_ACCEPT_COOKIES, MIDORI_TYPE_ACCEPT_COOKIES,
MIDORI_ACCEPT_COOKIES_ALL, MIDORI_ACCEPT_COOKIES_ALL,
#if HAVE_LIBSOUP
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#else
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
#endif
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_ORIGINAL_COOKIES_ONLY, PROP_ORIGINAL_COOKIES_ONLY,
@ -795,11 +753,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Proxy Server"), _("Proxy Server"),
_("The proxy server used for HTTP connections"), _("The proxy server used for HTTP connections"),
NULL, NULL,
#if HAVE_LIBSOUP
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#else
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
#endif
/** /**
* MidoriWebSettings:auto-detect-proxy: * MidoriWebSettings:auto-detect-proxy:
@ -815,11 +769,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Detect proxy server automatically"), _("Detect proxy server automatically"),
_("Whether to detect the proxy server automatically from the environment"), _("Whether to detect the proxy server automatically from the environment"),
TRUE, TRUE,
#if HAVE_LIBSOUP
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#else
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
#endif
/** /**
* MidoriWebSettings:identify-as: * MidoriWebSettings:identify-as:
@ -837,11 +787,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("What to identify as to web pages"), _("What to identify as to web pages"),
MIDORI_TYPE_IDENTITY, MIDORI_TYPE_IDENTITY,
MIDORI_IDENT_MIDORI, MIDORI_IDENT_MIDORI,
#if HAVE_LIBSOUP
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#else
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
#endif
/** /**
* MidoriWebSettings:ident-string: * MidoriWebSettings:ident-string:
@ -857,11 +803,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Identification string"), _("Identification string"),
_("The application identification string"), _("The application identification string"),
NULL, NULL,
#if HAVE_LIBSOUP
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#else
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
#endif
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_CACHE_SIZE, PROP_CACHE_SIZE,