Remove unused macros

[hvgrip.git] / src / cdplay.c

diff --git a/src/cdplay.c b/src/cdplay.c
index deb77d5..0399351 100644 (file)
--- a/src/cdplay.c
+++ b/src/cdplay.c
@@ -190,7 +190,7 @@ gboolean DiscDBLookupDisc(GripInfo *ginfo,DiscDBServer *server)
              DiscDBDiscid(disc));
 
   strncpy(hello.hello_program,"Grip",256);
-  strncpy(hello.hello_version,VERSION,256);
+  strncpy(hello.hello_version,PACKAGE_VERSION,256);
 
   if(ginfo->db_use_freedb && !strcasecmp(ginfo->discdb_encoding,"UTF-8"))
     hello.proto_version=6;
@@ -1749,7 +1749,7 @@ void UpdateDisplay(GripInfo *ginfo)
       
       gtk_label_set(GTK_LABEL(uinfo->play_time_label),buf);
       g_snprintf(icon_buf,sizeof(icon_buf),"%02d %s %s",
-                disc->curr_track,buf,PACKAGE);
+                disc->curr_track,buf,PACKAGE_NAME);
       gdk_window_set_icon_name(uinfo->app->window,icon_buf);
     }
   }
@@ -1763,7 +1763,7 @@ void UpdateDisplay(GripInfo *ginfo)
       g_snprintf(buf,80,"%02d:%02d",disc->length.mins,
                 disc->length.secs);
       g_snprintf(icon_buf, sizeof(icon_buf),"%02d %s %s",
-                disc->curr_track,buf,PACKAGE);
+                disc->curr_track,buf,PACKAGE_NAME);
               
       gtk_label_set(GTK_LABEL(uinfo->play_time_label),buf);
       
@@ -1786,7 +1786,7 @@ void UpdateDisplay(GripInfo *ginfo)
     }
     else {
       gtk_label_set(GTK_LABEL(uinfo->play_time_label),"--:--");
-      strncpy(icon_buf,PACKAGE,sizeof(icon_buf));
+      strncpy(icon_buf,PACKAGE_NAME,sizeof(icon_buf));
       
       SetCurrentTrack(ginfo,-1);
     }
@@ -1887,8 +1887,7 @@ void UpdateTracks(GripInfo *ginfo)
   }
 
   if(ginfo->ask_submit) {
-    gnome_app_ok_cancel_modal
-      ((GnomeApp *)uinfo->app,
+    DisplayOkCancelDialog(GTK_WINDOW(uinfo->app),
        _("This disc has been found on your secondary server,\n"
        "but not on your primary server.\n\n"
        "Do you wish to submit this disc information?"),
@@ -1900,7 +1899,7 @@ void UpdateTracks(GripInfo *ginfo)
   ginfo->first_time=0;
 }
 
-void SubmitEntry(gint reply,gpointer data)
+void SubmitEntry(gpointer data)
 {
   GripInfo *ginfo;
   int fd;
@@ -1908,8 +1907,6 @@ void SubmitEntry(gint reply,gpointer data)
   char mailcmd[256];
   char filename[256];
 
-  if(reply) return;
-
   ginfo=(GripInfo *)data;
 
   sprintf(filename,"/tmp/grip.XXXXXX");