Set application icon with Gtk+ instead of Gnome

[hvgrip.git] / src / grip.c

diff --git a/src/grip.c b/src/grip.c
index 303366c..80e859a 100644 (file)
--- a/src/grip.c
+++ b/src/grip.c
@@ -52,6 +52,8 @@ static void LoadImages(GripGUI *uinfo);
 static void DoLoadConfig(GripInfo *ginfo);
 void DoSaveConfig(GripInfo *ginfo);
 
+#define GRIP_URL "http://www.nostatic.org/grip"
+
 #define BASE_CFG_ENTRIES \
 {"grip_version",CFG_ENTRY_STRING,256,ginfo->version},\
 {"cd_device",CFG_ENTRY_STRING,256,ginfo->cd_device},\
@@ -175,12 +177,8 @@ GtkWidget *GripNew(const gchar* geometry,char *device,char *scsi_device,
   int major,minor,point;
   char buf[256];
 
-#ifdef CONVERSION_GNOME_TO_GTK
-  gnome_window_icon_set_default_from_file(GNOME_ICONDIR"/gripicon.png");
-#endif
-
   app = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- 
+
   ginfo=g_new0(GripInfo,1);
 
   gtk_object_set_user_data(GTK_OBJECT(app),(gpointer)ginfo);
@@ -300,17 +298,19 @@ GtkWidget *GripNew(const gchar* geometry,char *device,char *scsi_device,
   uinfo->playopts=MakePlayOpts(ginfo);
   gtk_box_pack_start(GTK_BOX(uinfo->winbox),uinfo->playopts,FALSE,FALSE,0);
   if(uinfo->track_prog_visible) gtk_widget_show(uinfo->playopts);
- 
+
   uinfo->controls=MakeControls(ginfo);
   if(uinfo->minimized)
     gtk_box_pack_start(GTK_BOX(uinfo->winbox),uinfo->controls,TRUE,TRUE,0);
   else
     gtk_box_pack_start(GTK_BOX(uinfo->winbox),uinfo->controls,FALSE,FALSE,0);
   gtk_widget_show(uinfo->controls);
-  
+
   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);
+
   CheckNewDisc(ginfo,FALSE);
 
   /* Check if we're running this version for the first time */
@@ -626,7 +626,18 @@ static void MakeStyles(GripGUI *uinfo)
 
 static void Homepage(void)
 {
-  system("gnome-moz-remote http://www.nostatic.org/grip");
+  int status;
+
+  status = system("firefox " GRIP_URL);
+  if (status != 0) {
+    status = system("opera " GRIP_URL);
+    if (status != 0) {
+      status = system("chromium-browser " GRIP_URL);
+      if (status != 0) {
+       status = system("gnome-moz-remote " GRIP_URL);
+      }
+    }
+  }
 }
 
 static void LoadImages(GripGUI *uinfo)