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

Use #ifdef for ZEITGEIST and GCR

Browse source
This commit is contained in:
Paweł Forysiuk 2012-08-27 22:50:33 +02:00 committed by Christian Dywan
parent a6606a9cee
commit 910e2d4842
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
midori/midori-browser.c
View file

@ -38,7 +38,7 @@
#include <granite.h> #include <granite.h>
#endif #endif
#if HAVE_ZEITGEIST #ifdef HAVE_ZEITGEIST
#include <zeitgeist.h> #include <zeitgeist.h>
#endif #endif
@ -489,7 +489,7 @@ midori_browser_update_history (KatzeItem* item,
const gchar* type, const gchar* type,
const gchar* event) const gchar* event)
{ {
#if HAVE_ZEITGEIST #ifdef HAVE_ZEITGEIST
const gchar* inter; const gchar* inter;
if (strstr (event, "access")) if (strstr (event, "access"))
inter = ZEITGEIST_ZG_ACCESS_EVENT; inter = ZEITGEIST_ZG_ACCESS_EVENT;

6
midori/midori-locationaction.c
View file

@ -1174,7 +1174,7 @@ midori_location_action_focus_out_event_cb (GtkWidget* widget,
return FALSE; return FALSE;
} }
#if HAVE_GCR #ifdef HAVE_GCR
#define GCR_API_SUBJECT_TO_CHANGE #define GCR_API_SUBJECT_TO_CHANGE
#include <gcr/gcr.h> #include <gcr/gcr.h>
#endif #endif
@ -1202,7 +1202,7 @@ midori_map_get_message (SoupMessage* message)
return full; return full;
} }
#if HAVE_GCR #ifdef HAVE_GCR
typedef enum { typedef enum {
MIDORI_CERT_TRUST, MIDORI_CERT_TRUST,
MIDORI_CERT_REVOKE, MIDORI_CERT_REVOKE,
@ -1295,7 +1295,7 @@ midori_location_action_show_page_info (GtkWidget* widget,
if (tls_cert == NULL) if (tls_cert == NULL)
return; return;
#if HAVE_GCR #ifdef HAVE_GCR
GByteArray* der_cert; GByteArray* der_cert;
GcrCertificate* gcr_cert; GcrCertificate* gcr_cert;
GtkWidget* details; GtkWidget* details;

8
midori/midori-view.c
View file

@ -26,7 +26,7 @@
#include <granite.h> #include <granite.h>
#endif #endif
#if HAVE_GCR #ifdef HAVE_GCR
#define GCR_API_SUBJECT_TO_CHANGE #define GCR_API_SUBJECT_TO_CHANGE
#include <gcr/gcr.h> #include <gcr/gcr.h>
@ -965,7 +965,7 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView* web_view
return TRUE; return TRUE;
} }
} }
#if HAVE_GCR #ifdef HAVE_GCR
else if (/* view->special && */ !strncmp (uri, "https", 5)) else if (/* view->special && */ !strncmp (uri, "https", 5))
{ {
/* We show an error page if the certificate is invalid. /* 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)); g_object_thaw_notify (G_OBJECT (view));
} }
#if HAVE_GCR #ifdef HAVE_GCR
const gchar* const gchar*
midori_location_action_tls_flags_to_string (GTlsCertificateFlags flags); midori_location_action_tls_flags_to_string (GTlsCertificateFlags flags);
#endif #endif
@ -1111,7 +1111,7 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view,
if (message if (message
&& soup_message_get_flags (message) & SOUP_MESSAGE_CERTIFICATE_TRUSTED) && soup_message_get_flags (message) & SOUP_MESSAGE_CERTIFICATE_TRUSTED)
view->security = MIDORI_SECURITY_TRUSTED; view->security = MIDORI_SECURITY_TRUSTED;
#if HAVE_GCR #ifdef HAVE_GCR
else if (!view->special && message != NULL) else if (!view->special && message != NULL)
{ {
GTlsCertificate* tls_cert; GTlsCertificate* tls_cert;