initial runloop implementation

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

diff --git a/src/moof/modal_dialog.hh b/src/moof/modal_dialog.hh
index c5139f27e06bb7dd95ae9c9a2915adcd5a897180..c53766237df20bd20ae5153c6eea872f1de5825c 100644 (file)
--- a/src/moof/modal_dialog.hh
+++ b/src/moof/modal_dialog.hh
@@ -18,15 +18,15 @@
  * supported, but only one can be used as determined at build time.
  */
 
-#include "../config.h"
+#include "config.h"
 
 #include <string>
 
 #if defined(_WIN32)
 #include <windows.h>
-#elif USE_GTK
+#elif WITH_GTK
 #include <gtk/gtk.h>
-#elif USE_QT4
+#elif WITH_QT4
 #include <QApplication>
 #include <QIcon>
 #include <QMessageBox>
@@ -113,7 +113,7 @@ struct modal_dialog
                MessageBox(0, (text1 + "\n" + text2).c_str(), title.c_str(),
                                   MB_OK | icon_type);
 
-#elif USE_GTK
+#elif WITH_GTK
 
                int             argc = 0;
                char**  argv;
@@ -140,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(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);
@@ -153,7 +153,7 @@ struct modal_dialog
                // FIXME - this doesn't seem to actually remove the window from the
                // screen when it closes
 
-#elif USE_QT4
+#elif WITH_QT4
 
                int             argc = 0;
                char**  argv;
@@ -180,8 +180,8 @@ struct modal_dialog
                dialog.setInformativeText(text2.c_str());
                dialog.setStandardButtons(QMessageBox::Close);
 
-               std::string icon_path(PACKAGE".png");
-               if (resource::find(icon_path))
+               std::string icon_path = resource::find_file(PACKAGE".png");
+               if (!icon_path.empty())
                {
                        QIcon icon(icon_path.c_str());
                        dialog.setWindowIcon(icon);