[Xfce4-commits] <midori:master> Consistently use ifdef HAVE_GRANITE

[Christian Dywan]

Updating branch refs/heads/master
         to b7f438589f70849b641f3dbd6781a466502630d7 (commit)
       from 27f5cbfb25b18ec4e0a89aa6e9841e7bb3365618 (commit)

commit b7f438589f70849b641f3dbd6781a466502630d7
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Jul 19 21:06:01 2012 +0200

    Consistently use ifdef HAVE_GRANITE

 katze/katze-preferences.c |    4 ++--
 midori/midori-browser.c   |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/katze/katze-preferences.c b/katze/katze-preferences.c
index 21183bc..cd89ffe 100644
--- a/katze/katze-preferences.c
+++ b/katze/katze-preferences.c
@@ -209,7 +209,7 @@ katze_preferences_prepare (KatzePreferences* preferences)
     g_signal_connect (priv->scrolled, "destroy",
                       G_CALLBACK (gtk_widget_destroyed), &priv->scrolled);
     #else
-    #if HAVE_GRANITE
+    #ifdef HAVE_GRANITE
     /* FIXME: granite: should return GtkWidget* like GTK+ */
     priv->notebook = (GtkWidget*)granite_widgets_static_notebook_new (FALSE);
     #else
@@ -308,7 +308,7 @@ katze_preferences_add_category (KatzePreferences* preferences,
     priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
     gtk_widget_show (priv->page);
     gtk_container_set_border_width (GTK_CONTAINER (priv->page), 4);
-    #if HAVE_GRANITE
+    #ifdef HAVE_GRANITE
     granite_widgets_static_notebook_append_page (
         GRANITE_WIDGETS_STATIC_NOTEBOOK (priv->notebook),
         priv->page, GTK_LABEL (gtk_label_new (label)));
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 7239e43..da96043 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2708,7 +2708,7 @@ _action_print_activate (GtkAction*     action,
     if (!(view = midori_browser_get_current_tab (browser)))
         return;
 
-    #if HAVE_GRANITE
+    #ifdef HAVE_GRANITE
     /* FIXME: Blacklist/ custom contract doesn't work
     gchar* blacklisted_contracts[] = { "print", NULL }; */
     /* FIXME: granite: should return GtkWidget* like GTK+ */
@@ -3283,7 +3283,7 @@ _action_compact_menu_populate_popup (GtkAction*     action,
       #endif
       { NULL },
       #if !HAVE_HILDON
-      #if !HAVE_GRANITE
+      #ifndef HAVE_GRANITE
       { "HelpFAQ" },
       { "HelpBugs"},
       #endif
@@ -5078,7 +5078,7 @@ _action_about_activate (GtkAction*     action,
     gtk_about_dialog_set_email_hook (_action_about_activate_email, NULL, NULL);
     gtk_about_dialog_set_url_hook (_action_about_activate_link, browser, NULL);
 #endif
-#if HAVE_GRANITE
+#ifdef HAVE_GRANITE
     /* FIXME: granite: should return GtkWidget* like GTK+ */
     dialog = (GtkWidget*)granite_widgets_about_dialog_new ();
     {
@@ -5557,7 +5557,7 @@ static const GtkActionEntry entries[] =
     { "WindowClose", NULL,
         N_("C_lose Window"), "<Ctrl><Shift>w",
         NULL, G_CALLBACK (_action_window_close_activate) },
-    #if HAVE_GRANITE
+    #ifdef HAVE_GRANITE
     { "Print", "document-export",
         N_("_Share"), "<Ctrl>p",
         NULL, G_CALLBACK (_action_print_activate) },