X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.cc;h=3b05e68766601af2e367844a8771a76943442aff;hp=6914c97df3525ed8ce7b7d206f8ee0b5c3598720;hb=ed04ddaaa59dcc42e375ec492dbda77f693530e9;hpb=51069fee9139ab8d14ecc80dffbe5deecb73d9e0

diff --git a/src/Main.cc b/src/Main.cc
index 6914c97..3b05e68 100644
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -216,9 +216,9 @@ void Main::printInfo(int argc, char* argv[])
 #ifdef YOINK_GITHEAD
 			  << "       Commit: "YOINK_GITHEAD << std::endl
 #endif
-			  << "      Version: "PACKAGE_VERSION << std::endl
+			  << "      Version: " << PACKAGE_VERSION << std::endl
 			  << "        Built: " << COMPILE_TIME << std::endl
-			  << "     Compiler: "COMPILER_STRING << std::endl
+			  << "     Compiler: " << COMPILER_STRING << std::endl
 			  << "       Assets: " << assets << std::endl
 			  << "Build options: "
 #ifndef HAVE_CLOCK_GETTIME
@@ -274,6 +274,9 @@ void goodbye()
 
 int main(int argc, char* argv[])
 {
+	moof::backend backend;
+
+	// FIXME: This is temporary.
 	moof::timer reloadTimer(boost::bind(&moof::resource::reload_as_needed),
 							SCALAR(2.0),
 							moof::timer::repeat);
@@ -306,10 +309,14 @@ int main(int argc, char* argv[])
 
 	try
 	{
-		std::string iconPath(PACKAGE".png");
-		iconPath = moof::resource::find_file(iconPath);
-		moof::image icon(iconPath);
-		icon.set_as_icon();
+		//std::string iconPath(PACKAGE".png");
+		//iconPath = moof::resource::find_file(iconPath);
+		//moof::image icon(iconPath);
+		//icon.set_as_icon();
+		moof::image_handle icon(PACKAGE, "png");
+		if (icon) icon->set_as_icon();
+		else moof::log_error("no icon loaded");
+		icon.unload();
 
 		class moof::video::attributes attributes(settings);
 		moof::video video(PACKAGE_STRING, attributes);