← Back to branch summary

~noskcaj/ubuntu/wily/epiphany-browser/merge

« back to all changes in this revision

Viewing changes to src/prefs-dialog.c

  • Committer: Package Import Robot
  • Author(s): Gustavo Noronha Silva
  • Date: 2013-03-20 20:45:41 UTC
  • mto: (120.1.2 experimental) (1.10.1) (105.1.14 sid)
  • mto: This revision was merged to the branch mainline in revision 121.
  • Revision ID: package-import@ubuntu.com-20130320204541-0t2adqjzvpflkni2
Tags: upstream-3.7.91
Import upstream version 3.7.91

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/prefs-dialog.c
985
985
        { "popups_allow_checkbutton", "active",
986
986
          EPHY_PREFS_WEB_SCHEMA, EPHY_PREFS_WEB_ENABLE_POPUPS,
987
987
          G_SETTINGS_BIND_DEFAULT, NULL, NULL },
 
988
        { "adblock_allow_checkbutton", "active",
 
989
          EPHY_PREFS_WEB_SCHEMA, EPHY_PREFS_WEB_ENABLE_ADBLOCK,
 
990
          G_SETTINGS_BIND_INVERT_BOOLEAN, NULL, NULL },
988
991
        { "enable_plugins_checkbutton", "active",
989
992
          EPHY_PREFS_WEB_SCHEMA, EPHY_PREFS_WEB_ENABLE_PLUGINS,
990
993
          G_SETTINGS_BIND_DEFAULT, NULL, NULL },
991
 
        { "enable_javascript_checkbutton", "active",
992
 
          EPHY_PREFS_WEB_SCHEMA, EPHY_PREFS_WEB_ENABLE_JAVASCRIPT,
993
 
          G_SETTINGS_BIND_DEFAULT, NULL, NULL },
994
994
        { "css_checkbox", "active",
995
995
          EPHY_PREFS_WEB_SCHEMA, EPHY_PREFS_WEB_ENABLE_USER_CSS,
996
996
          G_SETTINGS_BIND_DEFAULT, NULL, NULL },
1087
1087
                          G_CALLBACK (clear_cache_button_clicked_cb), dialog);
1088
1088
 
1089
1089
        encodings = EPHY_ENCODINGS (ephy_embed_shell_get_encodings
1090
 
                                        (EPHY_EMBED_SHELL (ephy_shell)));
 
1090
                                        (EPHY_EMBED_SHELL (ephy_shell_get_default ())));
1091
1091
 
1092
1092
        create_node_combo (dialog, encodings, "ISO-8859-1");
1093
1093