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

Only show close in speed dial if it can be saved

Browse source 
And un-negate return value of sokoke_is_app_or_private().
This commit is contained in:
Christian Dywan 2011-10-11 02:48:47 +02:00
parent 19a8002eee
commit 2f40eee0a5
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
midori/midori-preferences.c
View file

@ -296,7 +296,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
#define SPANNED_ADD(__widget) \ #define SPANNED_ADD(__widget) \
katze_preferences_add_widget (_preferences, __widget, "spanned") katze_preferences_add_widget (_preferences, __widget, "spanned")
/* Page "General" */ /* Page "General" */
if (sokoke_is_app_or_private ()) if (!sokoke_is_app_or_private ())
{ {
PAGE_NEW (GTK_STOCK_HOME, _("Startup")); PAGE_NEW (GTK_STOCK_HOME, _("Startup"));
FRAME_NEW (NULL); FRAME_NEW (NULL);

12
midori/midori-view.c
View file

@ -2609,7 +2609,7 @@ midori_view_populate_popup (MidoriView* view,
gtk_action_group_get_action (actions, "BookmarkAdd")); gtk_action_group_get_action (actions, "BookmarkAdd"));
gtk_menu_shell_append (menu_shell, menuitem); gtk_menu_shell_append (menu_shell, menuitem);
if (!midori_view_is_blank (view) && sokoke_is_app_or_private ()) if (!midori_view_is_blank (view) && !sokoke_is_app_or_private ())
{ {
menuitem = sokoke_action_create_popup_menu_item ( menuitem = sokoke_action_create_popup_menu_item (
gtk_action_group_get_action (actions, "AddSpeedDial")); gtk_action_group_get_action (actions, "AddSpeedDial"));
@ -3332,6 +3332,12 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings,
view->middle_click_opens_selection = g_value_get_boolean (&value); view->middle_click_opens_selection = g_value_get_boolean (&value);
else if (name == g_intern_string ("open-tabs-in-the-background")) else if (name == g_intern_string ("open-tabs-in-the-background"))
view->open_tabs_in_the_background = g_value_get_boolean (&value); view->open_tabs_in_the_background = g_value_get_boolean (&value);
else if (name == g_intern_string ("enable-scripts"))
{
/* Speed dial is only editable with scripts, so regenerate it */
if (midori_view_is_blank (view))
midori_view_reload (view, FALSE);
}
g_value_unset (&value); g_value_unset (&value);
} }
@ -3740,8 +3746,12 @@ prepare_speed_dial_html (MidoriView* view)
/* percent width size of one slot */ /* percent width size of one slot */
slot_size = (100 / grid_index); slot_size = (100 / grid_index);
/* No editing in private/ app mode or without scripts */
g_string_append_printf (markup, g_string_append_printf (markup,
"%s<style>.cross { display:none }</style>%s"
"<style> div.shortcut { height: %d%%; width: %d%%; }</style>\n", "<style> div.shortcut { height: %d%%; width: %d%%; }</style>\n",
sokoke_is_app_or_private () ? "" : "<noscript>",
sokoke_is_app_or_private () ? "" : "</noscript>",
slot_size + 1, slot_size - 4); slot_size + 1, slot_size - 4);
while (slot <= slot_count) while (slot <= slot_count)

2
midori/sokoke.c
View file

@ -1633,7 +1633,7 @@ sokoke_set_config_dir (const gchar* new_config_dir)
gboolean gboolean
sokoke_is_app_or_private (void) sokoke_is_app_or_private (void)
{ {
return strcmp ("/", sokoke_set_config_dir (NULL)); return !strcmp ("/", sokoke_set_config_dir (NULL));
} }
/** /**