Move application data files to data folder
[hvgrip.git] / src / tray.c
index ab1592a..3552b3e 100644 (file)
@@ -27,6 +27,7 @@
 #include "../pixmaps/menustop.xpm"
 #include "../pixmaps/menuprev.xpm"
 #include "../pixmaps/menunext.xpm"
+#include "common.h"
 
 static void MakeTrayIcon(GripInfo *ginfo);
 static void PlayCB(GtkWidget *widget, gpointer data);
@@ -128,7 +129,7 @@ void TrayMenuShowPause(GripInfo *ginfo)
 
 static void ToggleMenuItemSensitive(GtkWidget *widget, gpointer data)
 {
-       gtk_widget_set_sensitive(GTK_WIDGET(widget), (gboolean)data);
+       gtk_widget_set_sensitive(GTK_WIDGET(widget), GPOINTER_TO_INT(data));
 }
 
 void TrayGrayMenu(GripInfo *ginfo)
@@ -171,7 +172,7 @@ static void MakeTrayIcon(GripInfo *ginfo)
        
        gtk_container_add(GTK_CONTAINER(uinfo->tray_icon), uinfo->tray_ebox);
                
-       image = gtk_image_new_from_file(GNOME_ICONDIR"/griptray.png");
+       image = gtk_image_new_from_file(ICONDIR"/griptray.png");
        
        gtk_container_add(GTK_CONTAINER(uinfo->tray_ebox), image);