diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
| commit | 5a4fb2325f60d292b47330f540b26a3279341c90 (patch) | |
| tree | d2aa7967be25450b83e625025366c618101ae49f /src/resource-manager.cpp | |
| parent | The Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff) | |
| parent | Remove Snap menu item and improve grid menu item text (diff) | |
| download | inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip | |
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/resource-manager.cpp')
| -rw-r--r-- | src/resource-manager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp index c42ce6feb..fe53eca4f 100644 --- a/src/resource-manager.cpp +++ b/src/resource-manager.cpp @@ -9,12 +9,12 @@ #include <string> #include <vector> #include <algorithm> +#include <gtkmm/recentmanager.h> #include <glibmm/i18n.h> #include <glibmm/convert.h> #include <glibmm/fileutils.h> #include <glibmm/miscutils.h> #include <glibmm/uriutils.h> -#include <gtkmm/recentmanager.h> #include "resource-manager.h" @@ -28,7 +28,7 @@ namespace Inkscape { -std::vector<std::string> splitPath( std::string const &path ) +static std::vector<std::string> splitPath( std::string const &path ) { std::vector<std::string> parts; @@ -50,7 +50,7 @@ std::vector<std::string> splitPath( std::string const &path ) return parts; } -std::string convertPathToRelative( std::string const &path, std::string const &docbase ) +static std::string convertPathToRelative( std::string const &path, std::string const &docbase ) { std::string result = path; |