From: Hugo Villeneuve <hugo@hugovil.com>
Date: Thu, 10 Apr 2014 02:41:26 +0000 (-0400)
Subject: Rename GNOME_ICONDIR macro to ICONDIR
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=5e23c9545f28ee836152b8eff4e3bb1b29eec430;p=hvgrip.git

Rename GNOME_ICONDIR macro to ICONDIR
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 9088ece..1cd0108 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
     $(WARNINGCFLAGS) \
-    -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \
+    -DICONDIR=\""$(datadir)/pixmaps"\" \
     -DLOCALEDIR=\"$(localedir)\" \
     -DDOCDIR=\""$(docdir)"\"
 
diff --git a/src/grip.c b/src/grip.c
index f0e2f2f..41699e8 100644
--- a/src/grip.c
+++ b/src/grip.c
@@ -317,7 +317,7 @@ GtkWidget *GripNew(const gchar* geometry,char *device,char *scsi_device,
   gtk_container_add(GTK_CONTAINER(app), uinfo->winbox);
   gtk_widget_show(uinfo->winbox);
 
-  gtk_window_set_icon_from_file(GTK_WINDOW(app), GNOME_ICONDIR"/gripicon.png", NULL);
+  gtk_window_set_icon_from_file(GTK_WINDOW(app), ICONDIR"/gripicon.png", NULL);
 
   CheckNewDisc(ginfo,FALSE);
 
diff --git a/src/tray.c b/src/tray.c
index 64ff009..3552b3e 100644
--- a/src/tray.c
+++ b/src/tray.c
@@ -172,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);