Added support for geometry option (not fully tested).

[hvgrip.git] / src / cdplay.c

diff --git a/src/cdplay.c b/src/cdplay.c
index deb77d5..f26ff35 100644 (file)
--- a/src/cdplay.c
+++ b/src/cdplay.c
@@ -326,7 +326,7 @@ void MakeTrackPage(GripInfo *ginfo)
 
   gtk_tree_view_column_set_sizing(column,GTK_TREE_VIEW_COLUMN_FIXED);
   gtk_tree_view_column_set_fixed_width(column,
-                                       uinfo->win_width-
+                                       uinfo->size_hints.base_width-
                                        (GetLengthRipWidth(ginfo)+15));
 
   gtk_tree_view_append_column(GTK_TREE_VIEW(uinfo->track_list),column);
@@ -1056,8 +1056,8 @@ void MinMax(GtkWidget *widget,gpointer data)
                                 WINWIDTH,WINHEIGHT);
 
     gtk_window_resize(GTK_WINDOW(uinfo->app),
-                      uinfo->win_width,
-                      uinfo->win_height);
+                      uinfo->size_hints.base_width,
+                      uinfo->size_hints.base_height);
   }
   else {
     gtk_container_border_width(GTK_CONTAINER(uinfo->winbox),0);
@@ -1077,8 +1077,8 @@ void MinMax(GtkWidget *widget,gpointer data)
                                 MIN_WINWIDTH,MIN_WINHEIGHT);
 
     gtk_window_resize(GTK_WINDOW(uinfo->app),
-                      uinfo->win_width_min,
-                      uinfo->win_height_min);
+                      uinfo->size_hints.min_width,
+                      uinfo->size_hints.min_height);
 
     UpdateGTK();
   }
@@ -1617,12 +1617,12 @@ void UpdateDisplay(GripInfo *ginfo)
   
   if(!uinfo->minimized) {
     if(uinfo->track_edit_visible) {
-      gtk_window_get_size(GTK_WINDOW(uinfo->app),&uinfo->win_width,
+      gtk_window_get_size(GTK_WINDOW(uinfo->app),&uinfo->size_hints.base_width,
                           &uinfo->win_height_edit);
     }
     else
-      gtk_window_get_size(GTK_WINDOW(uinfo->app),&uinfo->win_width,
-                          &uinfo->win_height);
+      gtk_window_get_size(GTK_WINDOW(uinfo->app),&uinfo->size_hints.base_width,
+                          &uinfo->size_hints.base_height);
     
     if(old_width &&
        (old_width != uinfo->track_list->allocation.width)) {
@@ -1632,8 +1632,8 @@ void UpdateDisplay(GripInfo *ginfo)
     old_width=uinfo->track_list->allocation.width;
   }
   else {
-    gtk_window_get_size(GTK_WINDOW(uinfo->app),&uinfo->win_width_min,
-                        &uinfo->win_height_min);
+    gtk_window_get_size(GTK_WINDOW(uinfo->app),&uinfo->size_hints.min_width,
+                        &uinfo->size_hints.min_height);
   }
 
   if(!ginfo->looking_up) {
@@ -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");