Attachment #308885 for bug #411955

View | Details | Raw Unified | Return to bug 411955
Collapse All | Expand All

Lines 26-31 Link Here

(-)webkit-1.8/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h (-4 lines)
26	#include "webkitgeolocationpolicydecision.h"	26	#include "webkitgeolocationpolicydecision.h"
27		27
28	#if ENABLE(GEOLOCATION)
29
30	extern "C" {	28	extern "C" {
31		29
Lines 34-38 Link Here
34	}	32	}
35		33
36	#endif // ENABLE(GEOLOCATION)
37
38	#endif	34	#endif

Lines 54-61 Link Here

(-)webkit-1.8/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp (-3 / +5 lines)
54	}	54	}
55		55
56	#if ENABLE(GEOLOCATION)
57	WebKitGeolocationPolicyDecision* webkit_geolocation_policy_decision_new(WebKitWebFrame* frame, WebCore::Geolocation* geolocation)	56	WebKitGeolocationPolicyDecision* webkit_geolocation_policy_decision_new(WebKitWebFrame* frame, WebCore::Geolocation* geolocation)
58	{	57	{
59	g_return_val_if_fail(frame, NULL);	58	#if ENABLE(GEOLOCATION)
		59	g_return_val_if_fail(frame, 0);
60	WebKitGeolocationPolicyDecision* decision = WEBKIT_GEOLOCATION_POLICY_DECISION(g_object_new(WEBKIT_TYPE_GEOLOCATION_POLICY_DECISION, NULL));	60	WebKitGeolocationPolicyDecision* decision = WEBKIT_GEOLOCATION_POLICY_DECISION(g_object_new(WEBKIT_TYPE_GEOLOCATION_POLICY_DECISION, NULL));
61	WebKitGeolocationPolicyDecisionPrivate* priv = decision->priv;	61	WebKitGeolocationPolicyDecisionPrivate* priv = decision->priv;
Lines 64-69 Link Here
64	priv->geolocation = geolocation;	64	priv->geolocation = geolocation;
65	return decision;	65	return decision;
		66	#else
		67	return 0;
		68	#endif
66	}	69	}
67	#endif
68		70
69	/**	71	/**




2012-03-31  Martin Robinson  <mrobinson@igalia.com>

        [GTK] [Stable] --disable geolocation broken after recent merges
        https://bugs.webkit.org/show_bug.cgi?id=82452

        No review, as this is just a build fix.

        Fix the geolocation build.

        * webkit/webkitgeolocationpolicydecision.cpp:
        (webkit_geolocation_policy_decision_new): When gelocation is off, just return null.
        * webkit/webkitgeolocationpolicydecisionprivate.h: Activate webkit_geolocation_policy_decision_new
        for non-Geolocation builds.

2012-03-27  Martin Robinson  <mrobinson@igalia.com>


Return to bug 411955

Lines 1-2 Link Here

(-)webkit-1.8/Source/WebKit/gtk/ChangeLog (+14 lines)
		1	2012-03-31 Martin Robinson <mrobinson@igalia.com>
		2
		3	[GTK] [Stable] --disable geolocation broken after recent merges
		4	https://bugs.webkit.org/show_bug.cgi?id=82452
		5
		6	No review, as this is just a build fix.
		7
		8	Fix the geolocation build.
		9
		10	* webkit/webkitgeolocationpolicydecision.cpp:
		11	(webkit_geolocation_policy_decision_new): When gelocation is off, just return null.
		12	* webkit/webkitgeolocationpolicydecisionprivate.h: Activate webkit_geolocation_policy_decision_new
		13	for non-Geolocation builds.
		14
1	2012-03-27 Martin Robinson <mrobinson@igalia.com>	15	2012-03-27 Martin Robinson <mrobinson@igalia.com>
2		16