mesh and other random adjustments

[chaz/yoink] / src / moof / modal_dialog.hh

diff --git a/src/moof/modal_dialog.hh b/src/moof/modal_dialog.hh
index 65bc61f79e54b286c3a511899888adaaa3ef2469..e1d773989bebcf41c8912c0004b05221eeb686ac 100644 (file)
--- a/src/moof/modal_dialog.hh
+++ b/src/moof/modal_dialog.hh
@@ -18,11 +18,9 @@
  * supported, but only one can be used as determined at build time.
  */
 
-#include <string>
-
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <string>
 
 #if defined(_WIN32)
 #include <windows.h>
@@ -142,8 +140,8 @@ struct modal_dialog
                                                                                                 "%s", text2.c_str());
                gtk_window_set_title(GTK_WINDOW(dialog), title.c_str());
 
-               std::string icon_path(PACKAGE".png");
-               if (resource::find_path(icon_path))
+               std::string icon_path = resource::find_file(PACKAGE".png");
+               if (!icon_path.empty())
                {
                        GdkPixbuf* iconPixbuf = gdk_pixbuf_new_from_file(icon_path.c_str(),
                                                                                                                         NULL);
@@ -182,8 +180,8 @@ struct modal_dialog
                dialog.setInformativeText(text2.c_str());
                dialog.setStandardButtons(QMessageBox::Close);
 
-               std::string icon_path(PACKAGE".png");
-               if (resource::find_path(icon_path))
+               std::string icon_path = resource::find_file(PACKAGE".png");
+               if (!icon_path.empty())
                {
                        QIcon icon(icon_path.c_str());
                        dialog.setWindowIcon(icon);