Make the properties window's progress window a transient of the right

parent window, to avoid bizarre window reordering effects.

diff --git a/disobedience/choose-menu.c b/disobedience/choose-menu.c
index f1aa3b02c18323a5ed93fbcf8f21cd4dc44594f3..44ad04f59e160929c987545e92e0c600d9dfb1b7 100644 (file)
--- a/disobedience/choose-menu.c
+++ b/disobedience/choose-menu.c
@@ -121,7 +121,7 @@ static void choose_properties_activate(GtkMenuItem attribute((unused)) *item,
   gtk_tree_selection_selected_foreach(choose_selection,
                                       choose_gather_selected_files_callback,
                                       v);
   gtk_tree_selection_selected_foreach(choose_selection,
                                       choose_gather_selected_files_callback,
                                       v);

-  properties(v->nvec, (const char **)v->vec);
+  properties(v->nvec, (const char **)v->vec, toplevel);

 }
 
 /** @brief Set sensitivity for select children
 }
 
 /** @brief Set sensitivity for select children

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 29a278ebbe2dc92cb2baf26c359eba38b49b5d12..001a0b0a88309b909642073c408b2a18355fad37 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -119,7 +119,8 @@ void popup_protocol_error(int code,
                           const char *msg);
 /* Report an error */
 
                           const char *msg);
 /* Report an error */
 

-void properties(int ntracks, const char **tracks);
+void properties(int ntracks, const char **tracks,
+                GtkWidget *parent);

 /* Pop up a properties window for a list of tracks */
 
 GtkWidget *scroll_widget(GtkWidget *child);
 /* Pop up a properties window for a list of tracks */
 
 GtkWidget *scroll_widget(GtkWidget *child);


@@ -136,7 +137,8 @@ void popup_submsg(GtkWidget *parent, GtkMessageType mt, const char *msg);
 
 void fpopup_msg(GtkMessageType mt, const char *fmt, ...);
 
 
 void fpopup_msg(GtkMessageType mt, const char *fmt, ...);
 

-struct progress_window *progress_window_new(const char *title);
+struct progress_window *progress_window_new(const char *title,
+                                            GtkWidget *parent);

 /* Pop up a progress window */
 
 void progress_window_progress(struct progress_window *pw,
 /* Pop up a progress window */
 
 void progress_window_progress(struct progress_window *pw,

diff --git a/disobedience/progress.c b/disobedience/progress.c
index 2e31603f7b563d2c69893a9f5e03b689b70ff680..33dbfc979001f674f9ea68679e1a21d6a4bbe8cf 100644 (file)
--- a/disobedience/progress.c
+++ b/disobedience/progress.c
@@ -30,12 +30,14 @@ struct progress_window {
 };
 
 /** @brief Create a progress window */
 };
 
 /** @brief Create a progress window */

-struct progress_window *progress_window_new(const char *title) {
+struct progress_window *progress_window_new(const char *title,
+                                            GtkWidget *parent) {

   struct progress_window *pw = xmalloc(sizeof *pw);
 
   pw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   struct progress_window *pw = xmalloc(sizeof *pw);
 
   pw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);

-  gtk_window_set_transient_for(GTK_WINDOW(pw->window),
-                               GTK_WINDOW(toplevel));
+  if(parent)
+    gtk_window_set_transient_for(GTK_WINDOW(pw->window),
+                                 GTK_WINDOW(parent));

   g_signal_connect(pw->window, "destroy",
                   G_CALLBACK(gtk_widget_destroyed), &pw->window);
   gtk_window_set_default_size(GTK_WINDOW(pw->window), 360, -1);
   g_signal_connect(pw->window, "destroy",
                   G_CALLBACK(gtk_widget_destroyed), &pw->window);
   gtk_window_set_default_size(GTK_WINDOW(pw->window), 360, -1);

diff --git a/disobedience/properties.c b/disobedience/properties.c
index 62ea22f5bae6013908e98c9360c75a2176c539d5..092e8dbe5edc48e42f0aed0de2646bdda86e689d 100644 (file)
--- a/disobedience/properties.c
+++ b/disobedience/properties.c
@@ -186,7 +186,8 @@ static gboolean properties_keypress(GtkWidget attribute((unused)) *widget,
   }
 }
 
   }
 }
 

-void properties(int ntracks, const char **tracks) {
+void properties(int ntracks, const char **tracks,
+                GtkWidget *parent) {

   int n, m;
   struct prefdata *f;
   GtkWidget *buttonbox, *vbox, *label, *entry, *propagate;
   int n, m;
   struct prefdata *f;
   GtkWidget *buttonbox, *vbox, *label, *entry, *propagate;


@@ -299,7 +300,9 @@ void properties(int ntracks, const char **tracks) {
   if(pw)
     progress_window_progress(pw, 0, 0);
   /* Pop up a progress bar while we're waiting */
   if(pw)
     progress_window_progress(pw, 0, 0);
   /* Pop up a progress bar while we're waiting */

-  pw = progress_window_new("Fetching Track Properties");
+  while(parent->parent)
+    parent = parent->parent;
+  pw = progress_window_new("Fetching Track Properties", parent);

 }
 
 /* Everything is filled in now */
 }
 
 /* Everything is filled in now */

diff --git a/disobedience/queue-menu.c b/disobedience/queue-menu.c
index beb40f5b550ec42e0fb1d2e03af332ebe96cbdfc..ebf85553e688539f994318dad9cb2e669c0504d9 100644 (file)
--- a/disobedience/queue-menu.c
+++ b/disobedience/queue-menu.c
@@ -71,7 +71,7 @@ void ql_properties_activate(GtkMenuItem attribute((unused)) *menuitem,
     gtk_tree_model_iter_next(GTK_TREE_MODEL(ql->store), iter);
   }
   if(v->nvec)
     gtk_tree_model_iter_next(GTK_TREE_MODEL(ql->store), iter);
   }
   if(v->nvec)

-    properties(v->nvec, (const char **)v->vec);
+    properties(v->nvec, (const char **)v->vec, ql->view);

 }
 
 /* Scratch */
 }
 
 /* Scratch */