Replace obsolete INCLUDES with AM_CPPFLAGS

[hvgrip.git] / src / discedit.c

diff --git a/src/discedit.c b/src/discedit.c
index 7b7a9ee..9b37586 100644 (file)
--- a/src/discedit.c
+++ b/src/discedit.c
@@ -135,7 +135,7 @@ GtkWidget *MakeEditBox(GripInfo *ginfo)
       id3_genre_count++) {
     item = gtk_list_item_new_with_label(id3_genre->name);
     gtk_object_set_user_data(GTK_OBJECT(item),
-                            (gpointer)(id3_genre->num));
+                            GINT_TO_POINTER(id3_genre->num));
     uinfo->id3_genre_item_list=g_list_append(uinfo->id3_genre_item_list,item);
     gtk_signal_connect(GTK_OBJECT(item),"select",
                       GTK_SIGNAL_FUNC(ID3GenreChanged),
@@ -386,10 +386,10 @@ static void SaveDiscInfo(GtkWidget *widget,gpointer data)
   if(ginfo->have_disc) {
     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."));
   }
-  else gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+  else DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                          _("No disc present."));
 }
 
@@ -481,7 +481,7 @@ static void ID3GenreChanged(GtkWidget *widget,gpointer data)
 
   ginfo=(GripInfo *)data;
 
-  ginfo->ddata.data_id3genre=(int)gtk_object_get_user_data(GTK_OBJECT(widget));
+  ginfo->ddata.data_id3genre=GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(widget)));
   /*  ginfo->ddata.data_genre=ID32DiscDB(ginfo->ddata.data_id3genre);*/
 }
 
@@ -513,7 +513,7 @@ static void SplitTitleArtist(GtkWidget *widget,gpointer data)
   int mode;
 
   ginfo=(GripInfo *)data;
-  mode=(int)gtk_object_get_user_data(GTK_OBJECT(widget));
+  mode=GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(widget)));
 
   for(track=0;track<ginfo->disc.num_tracks;track++) {
     if(mode==0)
@@ -539,14 +539,14 @@ static void SubmitEntryCB(GtkWidget *widget,gpointer data)
   ginfo=(GripInfo *)data;
 
   if(!ginfo->have_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("Cannot submit. No disc is present."));
 
     return;
   }
 
   if(!ginfo->ddata.data_genre) {
-    /*    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    /*    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
           _("Submission requires a genre other than 'unknown'."));*/
     GetDiscDBGenre(ginfo);
 
@@ -554,14 +554,14 @@ static void SubmitEntryCB(GtkWidget *widget,gpointer data)
   }
 
   if(!*ginfo->ddata.data_title) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("You must enter a disc title."));
 
     return;
   }
 
   if(!*ginfo->ddata.data_artist) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+    DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
                       _("You must enter a disc artist."));
     
     return;
@@ -570,19 +570,17 @@ static void SubmitEntryCB(GtkWidget *widget,gpointer data)
   len=strlen(ginfo->discdb_submit_email);
 
   if(!strncasecmp(ginfo->discdb_submit_email+(len-9),".cddb.com",9))
-    gnome_app_ok_cancel_modal
-      ((GnomeApp *)ginfo->gui_info.app,
+    DisplayOkCancelDialog(GTK_WINDOW(ginfo->gui_info.app),
        _("You are about to submit this disc information\n"
        "to a commercial CDDB server, which will then\n"
        "own the data that you submit. These servers make\n"
        "a profit out of your effort. We suggest that you\n"
        "support free servers instead.\n\nContinue?"),
-       (GnomeReplyCallback)SubmitEntry,(gpointer)ginfo);
+       SubmitEntry, (gpointer)ginfo);
   else
-    gnome_app_ok_cancel_modal
-      ((GnomeApp *)ginfo->gui_info.app,
+    DisplayOkCancelDialog(GTK_WINDOW(ginfo->gui_info.app),
        _("You are about to submit this\ndisc information via email.\n\n"
-       "Continue?"),(GnomeReplyCallback)SubmitEntry,(gpointer)ginfo);
+       "Continue?"), SubmitEntry, (gpointer)ginfo);
 }
 
 /* Make the user pick a DiscDB genre on submit*/
@@ -619,7 +617,7 @@ static void GetDiscDBGenre(GripInfo *ginfo)
   for(genre=0;genre<12;genre++) {
     item=gtk_list_item_new_with_label(DiscDBGenre(genre));
     gtk_object_set_user_data(GTK_OBJECT(item),
-                            (gpointer)genre);
+                            GINT_TO_POINTER(genre));
     gtk_signal_connect(GTK_OBJECT(item), "select",
                       GTK_SIGNAL_FUNC(DiscDBGenreChanged),(gpointer)ginfo);
     gtk_container_add(GTK_CONTAINER(GTK_COMBO(genre_combo)->list),item);
@@ -664,5 +662,5 @@ static void DiscDBGenreChanged(GtkWidget *widget,gpointer data)
 
   ginfo=(GripInfo *)data;
 
-  ginfo->ddata.data_genre=(int)gtk_object_get_user_data(GTK_OBJECT(widget));
+  ginfo->ddata.data_genre=GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(widget)));
 }