← Back to branch summary

~ubuntu-branches/ubuntu/wily/epiphany-browser/wily

« back to all changes in this revision

Viewing changes to src/bookmarks/ephy-bookmarks-import.c

  • Committer: Package Import Robot
  • Author(s): Gustavo Noronha Silva, Jeremy Bicha, Emilio Pozuelo Monfort, Gustavo Noronha Silva
  • Date: 2012-12-10 11:40:01 UTC
  • mfrom: (1.8.8) (105.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20121210114001-42jjyg3qw3eyz00a
Tags: 3.6.1-1
[ Jeremy Bicha ]
* New upstream unstable release
* debian/control.in:
  - Bump minimum intltool to 0.50
* debian/epiphany-browser-data.install:
  - The developers no longer provide help files to install since they were
    too outdated
* Dropped upstream patches:
  - 01_email-as-user-for-password-remembering.patch
  - 13_toolbar_size_fixes.patch
* debian/watch: Watch for unstable releases.

[ Emilio Pozuelo Monfort ]
* New upstream release.
  + debian/patches/14_pkglibdir.patch:
    - Removed, applied upstream.
  + debian/control.in:
    - Update (build-)dependencies.

[ Gustavo Noronha Silva ]
* debian/control.in:
- Build-Depend on gnome-common >= 3.6, needed for the code
  coverage feature

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/bookmarks/ephy-bookmarks-import.c
712
712
        GString *name, *url;
713
713
        char *parsedname;
714
714
        GList *folders = NULL;
 
715
        gboolean retval = TRUE;
715
716
 
716
717
        if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
717
718
                                    EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING))
718
719
                return FALSE;
719
720
 
 
721
        if (!(bf = fopen (filename, "r"))) {
 
722
                g_warning ("Failed to open file: %s\n", filename);
 
723
                return FALSE;
 
724
        }
 
725
 
720
726
        name = g_string_new (NULL);
721
727
        url = g_string_new (NULL);
722
728
 
723
 
 
724
 
        if (!(bf = fopen (filename, "r"))) {
725
 
                g_warning ("Failed to open file: %s\n", filename);
726
 
                return FALSE;
727
 
        }
728
 
 
729
729
        while (!feof (bf)) {
730
730
                EphyNode *node;
731
731
                NSItemType t;
753
753
                        if (node == NULL)
754
754
                        {
755
755
                                node = ephy_bookmarks_find_bookmark (bookmarks, url->str);
 
756
                                if (node == NULL) {
 
757
                                        g_warning ("%s: `node' is NULL", G_STRFUNC);
 
758
                                        retval = FALSE;
 
759
                                        goto out;
 
760
                                }
756
761
                        }
757
762
 
758
 
                        g_return_val_if_fail (node != NULL, FALSE);
759
 
 
760
763
                        if (folders != NULL)
761
764
                        {
762
765
                                EphyNode *keyword;
781
784
                        break;
782
785
                }
783
786
        }
 
787
out:
784
788
        fclose (bf);
785
789
        g_string_free (name, TRUE);
786
790
        g_string_free (url, TRUE);
787
791
 
788
 
        return TRUE;
 
792
        return retval;
789
793
}
790
794
 
791
795
gboolean
976
980
 
977
981
        if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
978
982
                                    EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING))
 
983
                return FALSE;
979
984
 
980
985
        if (g_file_test (filename, G_FILE_TEST_EXISTS) == FALSE)
981
986
                return FALSE;