projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent the "Gtk-CRITICAL **: gtk_label_set_label: assertion `str != NULL' failed...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
iconcontroler.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
index
41bdf4c
..
1764ae2
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
@@
-72,7
+72,11
@@
using namespace synfig;
static Glib::RefPtr<Gdk::Pixbuf> _tree_pixbuf_table_value_type[(int)synfig::ValueBase::TYPE_END];
static Glib::RefPtr<Gdk::Pixbuf> _tree_pixbuf_table_value_type[(int)synfig::ValueBase::TYPE_END];
+#ifdef WIN32
IconControler::IconControler(const synfig::String& basepath)
IconControler::IconControler(const synfig::String& basepath)
+#else
+IconControler::IconControler(const synfig::String& /*basepath*/)
+#endif
{
Gtk::IconSource icon_source;
icon_source.set_direction_wildcarded();
{
Gtk::IconSource icon_source;
icon_source.set_direction_wildcarded();
@@
-90,11
+94,11
@@
IconControler::IconControler(const synfig::String& basepath)
char* synfig_root=getenv("SYNFIG_ROOT");
if(synfig_root) {
path_to_icons=synfig_root;
char* synfig_root=getenv("SYNFIG_ROOT");
if(synfig_root) {
path_to_icons=synfig_root;
- path_to_icons+=ETL_DIRECTORY_SEP
E
RATOR;
+ path_to_icons+=ETL_DIRECTORY_SEP
A
RATOR;
- path_to_icons+="share/pixmaps";
+ path_to_icons+="share/pixmaps
/synfigstudio
";
}
}
- path_to_icons+=ETL_DIRECTORY_SEP
E
RATOR;
+ path_to_icons+=ETL_DIRECTORY_SEP
A
RATOR;
try{
Gtk::Window::set_default_icon_from_file(path_to_icons+"synfig_icon."+IMAGE_EXT);
try{
Gtk::Window::set_default_icon_from_file(path_to_icons+"synfig_icon."+IMAGE_EXT);