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

Consistently use ifdef HAVE_GRANITE

Browse source
This commit is contained in:
Christian Dywan 2012-07-19 21:06:01 +02:00
parent 27f5cbfb25
commit b7f438589f
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
katze/katze-preferences.c
View file

@ -209,7 +209,7 @@ katze_preferences_prepare (KatzePreferences* preferences)
g_signal_connect (priv->scrolled, "destroy", g_signal_connect (priv->scrolled, "destroy",
G_CALLBACK (gtk_widget_destroyed), &priv->scrolled); G_CALLBACK (gtk_widget_destroyed), &priv->scrolled);
#else #else
#if HAVE_GRANITE #ifdef HAVE_GRANITE
/* FIXME: granite: should return GtkWidget* like GTK+ */ /* FIXME: granite: should return GtkWidget* like GTK+ */
priv->notebook = (GtkWidget*)granite_widgets_static_notebook_new (FALSE); priv->notebook = (GtkWidget*)granite_widgets_static_notebook_new (FALSE);
#else #else
@ -308,7 +308,7 @@ katze_preferences_add_category (KatzePreferences* preferences,
priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
gtk_widget_show (priv->page); gtk_widget_show (priv->page);
gtk_container_set_border_width (GTK_CONTAINER (priv->page), 4); 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_append_page (
GRANITE_WIDGETS_STATIC_NOTEBOOK (priv->notebook), GRANITE_WIDGETS_STATIC_NOTEBOOK (priv->notebook),
priv->page, GTK_LABEL (gtk_label_new (label))); priv->page, GTK_LABEL (gtk_label_new (label)));

8
midori/midori-browser.c
View file

@ -2708,7 +2708,7 @@ _action_print_activate (GtkAction* action,
if (!(view = midori_browser_get_current_tab (browser))) if (!(view = midori_browser_get_current_tab (browser)))
return; return;
#if HAVE_GRANITE #ifdef HAVE_GRANITE
/* FIXME: Blacklist/ custom contract doesn't work /* FIXME: Blacklist/ custom contract doesn't work
gchar* blacklisted_contracts[] = { "print", NULL }; */ gchar* blacklisted_contracts[] = { "print", NULL }; */
/* FIXME: granite: should return GtkWidget* like GTK+ */ /* FIXME: granite: should return GtkWidget* like GTK+ */
@ -3283,7 +3283,7 @@ _action_compact_menu_populate_popup (GtkAction* action,
#endif #endif
{ NULL }, { NULL },
#if !HAVE_HILDON #if !HAVE_HILDON
#if !HAVE_GRANITE #ifndef HAVE_GRANITE
{ "HelpFAQ" }, { "HelpFAQ" },
{ "HelpBugs"}, { "HelpBugs"},
#endif #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_email_hook (_action_about_activate_email, NULL, NULL);
gtk_about_dialog_set_url_hook (_action_about_activate_link, browser, NULL); gtk_about_dialog_set_url_hook (_action_about_activate_link, browser, NULL);
#endif #endif
#if HAVE_GRANITE #ifdef HAVE_GRANITE
/* FIXME: granite: should return GtkWidget* like GTK+ */ /* FIXME: granite: should return GtkWidget* like GTK+ */
dialog = (GtkWidget*)granite_widgets_about_dialog_new (); dialog = (GtkWidget*)granite_widgets_about_dialog_new ();
{ {
@ -5557,7 +5557,7 @@ static const GtkActionEntry entries[] =
{ "WindowClose", NULL, { "WindowClose", NULL,
N_("C_lose Window"), "<Ctrl><Shift>w", N_("C_lose Window"), "<Ctrl><Shift>w",
NULL, G_CALLBACK (_action_window_close_activate) }, NULL, G_CALLBACK (_action_window_close_activate) },
#if HAVE_GRANITE #ifdef HAVE_GRANITE
{ "Print", "document-export", { "Print", "document-export",
N_("_Share"), "<Ctrl>p", N_("_Share"), "<Ctrl>p",
NULL, G_CALLBACK (_action_print_activate) }, NULL, G_CALLBACK (_action_print_activate) },