X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Focaldialogs.cpp;h=ba572336cf50df620cc7555f6a4d18f1b270afeb;hb=9acbda558d50be3b21e4b384be758bc12a461072;hp=19b739061d9c14b716f791857e0f1f70871f1cd0;hpb=5f2c606c00ae95f21324b0e16ff024529843192b;p=inkscape.git diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index 19b739061..ba572336c 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -1,7 +1,7 @@ -/** - * Implementation of the ocal dialog interfaces defined in ocaldialog.h - * - * Authors: +/** @file + * @brief Open Clip Art Library integration dialogs - implementation + */ +/* Authors: * Bruno Dilly * Other dudes from The Inkscape Organization * @@ -25,6 +25,7 @@ #include "gc-core.h" #include #include "io/sys.h" +#include "preferences.h" namespace Inkscape { @@ -306,8 +307,9 @@ void FileListViewText::on_cursor_changed() //get file url fileUrl = get_text(posArray[0], 1); //http url + //Inkscape::Preferences *prefs = Inkscape::Preferences::get(); //Glib::ustring fileUrl = "dav://"; //dav url - //fileUrl.append(prefs_get_string_attribute("options.ocalurl", "str")); + //fileUrl.append(prefs->getString("/options/ocalurl/str")); //fileUrl.append("/dav.php/"); //fileUrl.append(get_text(posArray[0], 3)); //author dir //fileUrl.append("/"); @@ -418,11 +420,12 @@ void FileImportFromOCALDialog::searchTagEntryChangedCallback() notFoundLabel->hide(); descriptionLabel->set_text(""); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); Glib::ustring searchTag = searchTagEntry->get_text(); // create the ocal uri to get rss feed Glib::ustring uri = "http://"; - uri.append(prefs_get_string_attribute("options.ocalurl", "str")); + uri.append(prefs->getString("/options/ocalurl/str")); uri.append("/media/feed/rss/"); uri.append(searchTag); if (!Glib::get_charset()) //If we are not utf8 @@ -437,7 +440,7 @@ void FileImportFromOCALDialog::searchTagEntryChangedCallback() result = gnome_vfs_open (&from_handle, uri.c_str(), GNOME_VFS_OPEN_READ); if (result != GNOME_VFS_OK) { - sp_ui_error_dialog(_("Failed to receive the Open Clip Art Library RSS feed. Verify if the server name is correct in Configuration->Misc (e.g.: openclipart.org)")); + sp_ui_error_dialog(_("Failed to receive the Open Clip Art Library RSS feed. Verify if the server name is correct in Configuration->Import/Export (e.g.: openclipart.org)")); return; }