X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fcdplay.c;h=0399351902a25983c488fd40c0c873da263b830a;hb=c6cd8ab8023a92c481cfbae3922f71dfa0f9ca4e;hp=f5439e570088cc797269310fb00efabffa0410d9;hpb=45c0e948e8b98c5034d1e76e32c549063d185811;p=hvgrip.git

diff --git a/src/cdplay.c b/src/cdplay.c
index f5439e5..0399351 100644
--- a/src/cdplay.c
+++ b/src/cdplay.c
@@ -79,7 +79,7 @@ static void DiscDBToggle(GtkWidget *widget,gpointer data)
   }
   else {
     if(ginfo->ripping_a_disc) {
-      gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+      DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                         _("Cannot do lookup while ripping."));
 
       return;
@@ -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;
@@ -629,7 +629,7 @@ static void PlaylistChanged(GtkWindow *window,GtkWidget *widget,gpointer data)
 
   if(DiscDBWriteDiscData(&(ginfo->disc),&(ginfo->ddata),NULL,TRUE,FALSE,
                          "utf-8")<0)
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Error saving disc data."));
 }
 
@@ -1169,7 +1169,7 @@ static void FastFwdCB(GtkWidget *widget,gpointer data)
   ginfo=(GripInfo *)data;
 
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Cannot fast forward while ripping."));
 
     return;
@@ -1200,7 +1200,7 @@ static void RewindCB(GtkWidget *widget,gpointer data)
   ginfo=(GripInfo *)data;
 
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Cannot rewind while ripping."));
 
     return;
@@ -1231,7 +1231,7 @@ static void NextDisc(GtkWidget *widget,gpointer data)
   ginfo=(GripInfo *)data;
 
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Cannot switch discs while ripping."));
 
     return;
@@ -1253,7 +1253,7 @@ void EjectDisc(GtkWidget *widget,gpointer data)
   LogStatus(ginfo,_("Eject disc\n"));
 
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Cannot eject while ripping."));
 
     return;
@@ -1330,7 +1330,7 @@ void PlayTrackCB(GtkWidget *widget,gpointer data)
   disc=&(ginfo->disc);
 
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Cannot play while ripping."));
    
     return;
@@ -1398,7 +1398,7 @@ void NextTrackCB(GtkWidget *widget,gpointer data)
 void NextTrack(GripInfo *ginfo)
 {
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Cannot switch tracks while ripping."));
     return;
   }
@@ -1429,7 +1429,7 @@ void PrevTrackCB(GtkWidget *widget,gpointer data)
 static void PrevTrack(GripInfo *ginfo)
 {
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Cannot switch tracks while ripping."));
     return;
   }
@@ -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,15 +1907,13 @@ void SubmitEntry(gint reply,gpointer data)
   char mailcmd[256];
   char filename[256];
 
-  if(reply) return;
-
   ginfo=(GripInfo *)data;
 
   sprintf(filename,"/tmp/grip.XXXXXX");
   fd = mkstemp(filename);
 
   if(fd == -1) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Error: Unable to create temporary file."));
     return;
   }
@@ -1925,7 +1922,7 @@ void SubmitEntry(gint reply,gpointer data)
 
   if(!efp) {
     close(fd);
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Error: Unable to create temporary file."));
   }
   else {
@@ -1943,7 +1940,7 @@ void SubmitEntry(gint reply,gpointer data)
     if(DiscDBWriteDiscData(&(ginfo->disc),&(ginfo->ddata),efp,FALSE,
 			   ginfo->db_use_freedb,ginfo->db_use_freedb?
 			   "UTF-8":ginfo->discdb_encoding)<0) {
-      gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+      DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                         _("Error: Unable to write disc data."));
       fclose(efp);
     }