Fixed applet to reflect new gui script

3 files changed, 12 insertions, 7 deletions

diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp
index d6de1ee..6f72bf5 100644
--- a/src/Applet/CCApplet.cpp
+++ b/src/Applet/CCApplet.cpp
@@ -80,7 +80,7 @@ void CApplet::SetIconTooltip(const char *format, ...)
     }
     else
     {
-        gtk_status_icon_set_tooltip(m_pStatusIcon,"Error while setting tooltip!");
+        gtk_status_icon_set_tooltip(m_pStatusIcon,"Error while setting the tooltip!");
     }
     delete[] buf;
     
@@ -103,12 +103,15 @@ void CApplet::OnAppletActivate_CB(GtkStatusIcon *status_icon,gpointer user_data)
         case GTK_RESPONSE_YES:
             //FIXME - use fork+exec and absolute paths?
             getcwd(cwd,1024);
-            if(chdir("../Gui") != -1){
-                popen("./mainwindow.py","r");
-                chdir(cwd);
+            if(chdir("../bin") != -1){
+                popen("./cc-gui","r");
+                if(chdir(cwd) == -1)
+                {
+                    std::cerr << "error changing the directory" << std::endl;
+                }
             }
             else{
-                std::cerr << "error changing directory" << std::endl;
+                std::cerr << "error changing the directory" << std::endl;
             }
             gtk_status_icon_set_visible(applet->m_pStatusIcon,false);
             break;
diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py
index 7f2cb7c..02f2a03 100644
--- a/src/Gui/CCMainWindow.py
+++ b/src/Gui/CCMainWindow.py
@@ -24,7 +24,8 @@ class MainWindow():
             gui_error_message(e.message)
             sys.exit()
         #Set the Glade file
-        self.gladefile = "ccgui.glade"  
+        # FIXME add to PATH
+        self.gladefile = "../share/crash-catcher/ccgui.glade"  
         self.wTree = gtk.glade.XML(self.gladefile) 
         
         #Get the Main Window, and connect the "destroy" event
diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py
index f10388c..fa6e242 100644
--- a/src/Gui/CCReporterDialog.py
+++ b/src/Gui/CCReporterDialog.py
@@ -11,7 +11,8 @@ class ReporterDialog():
     def __init__(self, dump):
         self.dump = dump
         #Set the Glade file
-        self.gladefile = "ccgui.glade"  
+        # FIXME add to path
+        self.gladefile = "../share/crash-catcher/ccgui.glade"  
         self.wTree = gtk.glade.XML(self.gladefile) 
         #Get the Main Window, and connect the "destroy" event
         self.window = self.wTree.get_widget("reporter_dialog")