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

Remove User stylesheet entirely, don't support it

Browse source
This commit is contained in:
Christian Dywan 2008-10-03 03:44:16 +02:00
parent 37aca287b4
commit 1801298731
1 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
midori/midori-preferences.c
View file

@ -58,24 +58,12 @@ midori_preferences_class_init (MidoriPreferencesClass* class)
PROP_SETTINGS, PROP_SETTINGS,
g_param_spec_object ( g_param_spec_object (
"settings", "settings",
"Settings", _("Settings"),
_("Settings instance to provide properties"), _("Settings instance to provide properties"),
MIDORI_TYPE_WEB_SETTINGS, MIDORI_TYPE_WEB_SETTINGS,
G_PARAM_WRITABLE)); G_PARAM_WRITABLE));
} }
static void
clear_button_clicked_cb (GtkWidget* button, GtkWidget* file_chooser)
{
gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (file_chooser), "");
/* Emit signal manually for Gtk doesn't emit it otherwise */
#if GTK_CHECK_VERSION (2, 12, 0)
g_signal_emit_by_name (file_chooser, "file-set");
#else
g_signal_emit_by_name (file_chooser, "selection-changed");
#endif
}
static void static void
midori_preferences_init (MidoriPreferences* preferences) midori_preferences_init (MidoriPreferences* preferences)
{ {
@ -226,7 +214,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
GtkWidget* entry; GtkWidget* entry;
GtkWidget* hbox; GtkWidget* hbox;
gint icon_width, icon_height; gint icon_width, icon_height;
gchar* user_stylesheet_uri;
g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_PREFERENCES (preferences));
g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings));
@ -337,30 +324,10 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
INDENTED_ADD (button, 0, 1, 2, 3); INDENTED_ADD (button, 0, 1, 2, 3);
button = katze_property_proxy (settings, "enable-plugins", NULL); button = katze_property_proxy (settings, "enable-plugins", NULL);
SPANNED_ADD (button, 1, 2, 2, 3); SPANNED_ADD (button, 1, 2, 2, 3);
g_object_get (settings, "user-stylesheet-uri", &user_stylesheet_uri, NULL);
/* Add the stylesheet uri widget only if there's a value
Otherwise we prefer to not use it, it is superfluous basically */
if (user_stylesheet_uri && *user_stylesheet_uri)
{
label = katze_property_label (settings, "user-stylesheet-uri");
INDENTED_ADD (label, 0, 1, 3, 4);
hbox = gtk_hbox_new (FALSE, 4);
entry = katze_property_proxy (settings, "user-stylesheet-uri", "uri");
gtk_widget_set_sensitive (entry, FALSE);
gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
button = gtk_button_new ();
gtk_container_add (GTK_CONTAINER (button),
gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU));
g_signal_connect (button, "clicked",
G_CALLBACK (clear_button_clicked_cb), entry);
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4);
FILLED_ADD (hbox, 1, 2, 3, 4);
g_free (user_stylesheet_uri);
}
label = katze_property_label (settings, "location-entry-search"); label = katze_property_label (settings, "location-entry-search");
INDENTED_ADD (label, 0, 1, 5, 6); INDENTED_ADD (label, 0, 1, 3, 4);
entry = katze_property_proxy (settings, "location-entry-search", NULL); entry = katze_property_proxy (settings, "location-entry-search", NULL);
FILLED_ADD (entry, 1, 2, 5, 6); FILLED_ADD (entry, 1, 2, 3, 4);
/* Page "Interface" */ /* Page "Interface" */
PAGE_NEW (_("Interface")); PAGE_NEW (_("Interface"));