2 files changed, 35 insertions, 10 deletions

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 4254350353..3af884abba 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -138,23 +138,23 @@ void
 UIConfiguration::reset_gtk_theme ()
 {
 	LocaleGuard lg;
-	stringstream ss;
-
-	ss << "gtk_color_scheme = \"" << hex;
+	std::string color_scheme_string("gtk_color_scheme = \"");
 
 	for (ColorAliases::iterator g = color_aliases.begin(); g != color_aliases.end(); ++g) {
 
 		if (g->first.find ("gtk_") == 0) {
 			const string gtk_name = g->first.substr (4);
-			ss << gtk_name << ":#" << std::setw (6) << setfill ('0') << (color (g->second) >> 8) << ';';
+			ArdourCanvas::Color a_color = color (g->second);
+
+			color_scheme_string += gtk_name + ":#" + color_to_hex_string_no_alpha (a_color) + ';';
 		}
 	}
 
-	ss << '"' << dec << endl;
+	color_scheme_string += '"';
 
 	/* reset GTK color scheme */
 
-	Gtk::Settings::get_default()->property_gtk_color_scheme() = ss.str();
+	Gtk::Settings::get_default()->property_gtk_color_scheme() = color_scheme_string;
 }
 
 void
@@ -243,7 +243,6 @@ UIConfiguration::load_defaults ()
 		warning << string_compose (_("Could not find default UI configuration file %1"), default_ui_config_file_name) << endmsg;
 	}
 
-
 	if (ret == 0) {
 		/* reload color theme */
 		load_color_theme (false);
@@ -371,9 +370,7 @@ UIConfiguration::store_color_theme ()
 	for (Colors::const_iterator i = colors.begin(); i != colors.end(); ++i) {
 		XMLNode* node = new XMLNode (X_("Color"));
 		node->set_property (X_("name"), i->first);
-		stringstream ss;
-		ss << "0x" << setw (8) << setfill ('0') << hex << i->second;
-		node->set_property (X_("value"), ss.str());
+		node->set_property (X_("value"), color_to_hex_string (i->second));
 		parent->add_child_nocopy (*node);
 	}
 	root->add_child_nocopy (*parent);
@@ -799,3 +796,28 @@ UIConfiguration::load_rc_file (bool themechange, bool allow_own)
 
 	Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path, themechange);
 }
+
+std::string
+UIConfiguration::color_to_hex_string (ArdourCanvas::Color c)
+{
+	char buf[16];
+	int retval = g_snprintf (buf, sizeof(buf), "%08x", c);
+
+	if (retval < 0 || retval >= (int)sizeof(buf)) {
+		assert(false);
+	}
+	return buf;
+}
+
+std::string
+UIConfiguration::color_to_hex_string_no_alpha (ArdourCanvas::Color c)
+{
+	c >>= 8; // shift/remove alpha
+	char buf[16];
+	int retval = g_snprintf (buf, sizeof(buf), "%06x", c);
+
+	if (retval < 0 || retval >= (int)sizeof(buf)) {
+		assert(false);
+	}
+	return buf;
+}
diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index 2fac5e571d..977ec20351 100644
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -83,6 +83,9 @@ private:
 	ArdourCanvas::HSV  color_hsv (const std::string&) const;
 	ArdourCanvas::SVAModifier modifier (const std::string&) const;
 
+	static std::string color_to_hex_string (ArdourCanvas::Color c);
+	static std::string color_to_hex_string_no_alpha (ArdourCanvas::Color c);
+
 	sigc::signal<void>  ColorsChanged;
 
 	void reset_dpi ();