Use #ifdef for ZEITGEIST and GCR
This commit is contained in:
parent
a6606a9cee
commit
910e2d4842
3 changed files with 9 additions and 9 deletions
|
@ -38,7 +38,7 @@
|
|||
#include <granite.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_ZEITGEIST
|
||||
#ifdef HAVE_ZEITGEIST
|
||||
#include <zeitgeist.h>
|
||||
#endif
|
||||
|
||||
|
@ -489,7 +489,7 @@ midori_browser_update_history (KatzeItem* item,
|
|||
const gchar* type,
|
||||
const gchar* event)
|
||||
{
|
||||
#if HAVE_ZEITGEIST
|
||||
#ifdef HAVE_ZEITGEIST
|
||||
const gchar* inter;
|
||||
if (strstr (event, "access"))
|
||||
inter = ZEITGEIST_ZG_ACCESS_EVENT;
|
||||
|
|
|
@ -1174,7 +1174,7 @@ midori_location_action_focus_out_event_cb (GtkWidget* widget,
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
#if HAVE_GCR
|
||||
#ifdef HAVE_GCR
|
||||
#define GCR_API_SUBJECT_TO_CHANGE
|
||||
#include <gcr/gcr.h>
|
||||
#endif
|
||||
|
@ -1202,7 +1202,7 @@ midori_map_get_message (SoupMessage* message)
|
|||
return full;
|
||||
}
|
||||
|
||||
#if HAVE_GCR
|
||||
#ifdef HAVE_GCR
|
||||
typedef enum {
|
||||
MIDORI_CERT_TRUST,
|
||||
MIDORI_CERT_REVOKE,
|
||||
|
@ -1295,7 +1295,7 @@ midori_location_action_show_page_info (GtkWidget* widget,
|
|||
if (tls_cert == NULL)
|
||||
return;
|
||||
|
||||
#if HAVE_GCR
|
||||
#ifdef HAVE_GCR
|
||||
GByteArray* der_cert;
|
||||
GcrCertificate* gcr_cert;
|
||||
GtkWidget* details;
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include <granite.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_GCR
|
||||
#ifdef HAVE_GCR
|
||||
#define GCR_API_SUBJECT_TO_CHANGE
|
||||
#include <gcr/gcr.h>
|
||||
|
||||
|
@ -965,7 +965,7 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView* web_view
|
|||
return TRUE;
|
||||
}
|
||||
}
|
||||
#if HAVE_GCR
|
||||
#ifdef HAVE_GCR
|
||||
else if (/* view->special && */ !strncmp (uri, "https", 5))
|
||||
{
|
||||
/* We show an error page if the certificate is invalid.
|
||||
|
@ -1054,7 +1054,7 @@ webkit_web_view_load_started_cb (WebKitWebView* web_view,
|
|||
g_object_thaw_notify (G_OBJECT (view));
|
||||
}
|
||||
|
||||
#if HAVE_GCR
|
||||
#ifdef HAVE_GCR
|
||||
const gchar*
|
||||
midori_location_action_tls_flags_to_string (GTlsCertificateFlags flags);
|
||||
#endif
|
||||
|
@ -1111,7 +1111,7 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view,
|
|||
if (message
|
||||
&& soup_message_get_flags (message) & SOUP_MESSAGE_CERTIFICATE_TRUSTED)
|
||||
view->security = MIDORI_SECURITY_TRUSTED;
|
||||
#if HAVE_GCR
|
||||
#ifdef HAVE_GCR
|
||||
else if (!view->special && message != NULL)
|
||||
{
|
||||
GTlsCertificate* tls_cert;
|
||||
|
|
Loading…
Reference in a new issue