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

« back to all changes in this revision

Viewing changes to src/ephy-location-controller.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:
757
757
 
758
758
        priv->address = g_strdup ("");
759
759
        priv->editable = TRUE;
760
 
        priv->bookmarks = ephy_shell_get_bookmarks (ephy_shell);
 
760
        priv->bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
761
761
        priv->smart_bmks = ephy_bookmarks_get_smart_bookmarks
762
762
                (controller->priv->bookmarks);
763
763
        priv->sync_address_is_blocked = FALSE;