rpms/gnome-media/FC-6 gnome-media-2.16.1-set-modal.patch, NONE, 1.1 gnome-media.spec, 1.82, 1.83 gnome-media-set-modal.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: bnocera

Update of /cvs/dist/rpms/gnome-media/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv26349

Modified Files:
	gnome-media.spec 
Added Files:
	gnome-media-2.16.1-set-modal.patch 
Removed Files:
	gnome-media-set-modal.patch 
Log Message:
- Fix patch so it applies to 2.16.1


gnome-media-2.16.1-set-modal.patch:
 audio-profiles-edit.c |   39 +++++----------------------------------
 1 files changed, 5 insertions(+), 34 deletions(-)

--- NEW FILE gnome-media-2.16.1-set-modal.patch ---
--- gnome-media-2.16.1/profiles/audio-profiles-edit.c.modal	2007-04-19 11:22:59.000000000 +0100
+++ gnome-media-2.16.1/profiles/audio-profiles-edit.c	2007-04-19 11:24:34.000000000 +0100
@@ -420,8 +420,8 @@ edit_button_clicked (GtkWidget   *button
 
     /* FIXME: is this the right function name ? */
     edit_dialog = gm_audio_profile_edit_new ((GConfClient *)profile, gm_audio_profile_get_id (profile));
-                       //GTK_WINDOW (dialog));
     g_return_if_fail (edit_dialog != NULL);
+    gtk_window_set_modal (GTK_WINDOW (edit_dialog), TRUE);
     gtk_widget_show_all (GTK_WIDGET (edit_dialog));
     gtk_dialog_run (GTK_DIALOG(edit_dialog));
   }
@@ -522,7 +522,7 @@ delete_button_clicked (GtkWidget   *butt
   }
 
   confirm_dialog = gtk_message_dialog_new (dialog->priv->transient_parent,
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_QUESTION,
                                    GTK_BUTTONS_NONE,
                                    "%s",
@@ -832,6 +832,8 @@ gm_audio_profiles_edit_new (GConfClient 
   else
     dialog->priv->transient_parent = GTK_WINDOW (dialog);
 
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
   /* subscribe to changes to profile list */
 /*
   err = NULL;
@@ -852,38 +854,6 @@ gm_audio_profiles_edit_new (GConfClient 
   return GTK_WIDGET (dialog);
 }
 
-/* show the given profile manage dialog
- * if it doesn't exist, create it
- * return the profile manage dialog widget
- */
-GtkWidget*
-gm_audio_profile_manage_dialog (GtkWidget *dialog, GConfClient *conf, GtkWindow *transient_parent)
-{
-  GtkWindow *old_transient_parent = NULL;
-  GtkWidget *new;
-
-  if (dialog == NULL)
-  {
-    new = GTK_WIDGET (gm_audio_profiles_edit_new (conf, transient_parent));
-
-    return new;
-  }
-
-  /* do stuff with the already existing dialog */
-
-  old_transient_parent = gtk_window_get_transient_for (GTK_WINDOW (dialog));
-
-  if (old_transient_parent != transient_parent)
-  {
-    gtk_window_set_transient_for (GTK_WINDOW (dialog), transient_parent);
-    gtk_widget_hide (dialog); /* re-show the window on its new parent */
-  }
-
-  gtk_widget_show_all (dialog);
-  gtk_window_present (GTK_WINDOW (dialog));
-  return dialog;
-}
-
 /*
  * creating a new profile from the Edit Profiles dialog
  */
@@ -1073,6 +1043,7 @@ gm_audio_profiles_edit_new_profile (GMAu
   create_button = g_object_get_data (G_OBJECT (dialog->priv->new_profile_dialog), "create_button");
   gtk_widget_set_sensitive (create_button, FALSE);
 
+  gtk_window_set_modal (GTK_WINDOW (dialog->priv->new_profile_dialog), TRUE);
   gtk_widget_show_all (dialog->priv->new_profile_dialog);
   gtk_window_present (GTK_WINDOW (dialog->priv->new_profile_dialog));
   gtk_dialog_run (GTK_DIALOG (dialog->priv->new_profile_dialog));


Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/FC-6/gnome-media.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gnome-media.spec	19 Apr 2007 10:08:29 -0000	1.82
+++ gnome-media.spec	19 Apr 2007 10:29:29 -0000	1.83
@@ -17,7 +17,7 @@
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2
 Patch4:         gnome-media-2.16.0-settings.patch
 Patch5:         gnome-media-2.13.5-hide-help-button.patch
-Patch6:         gnome-media-set-modal.patch
+Patch6:         gnome-media-2.16.1-set-modal.patch
 
 Requires:       scrollkeeper >= 0.1.4
 BuildRoot:      %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root
@@ -69,7 +69,7 @@
 %setup -q
 %patch4 -p1 -b .settings
 %patch5 -p1 -b .hide-help-button
-%patch6 -p0 -b .modal
+%patch6 -p1 -b .modal
 
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null


--- gnome-media-set-modal.patch DELETED ---