From aafa007aef5b61f93fcb4f1fdc8aa1fd690771ff Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 6 Oct 2008 18:57:57 +0000
Subject: (mainwindow) move "add media" menu entries from the "Options" menu
 into the "File" menu (#44601)

---
 NEWS                          | 3 +++
 Rpmdrake/edit_urpm_sources.pm | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 34e37417..512d92ce 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
 - do not ask sources on startup
+- edit_urpm_sources:
+  o move "add media" menu entries from the "Options" menu into the
+    "File" menu (#44601)
 - gurpmi.addmedia:
   o handle --urpmi-root
 - rpmdrake:
diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm
index 2071e13d..d4d31887 100644
--- a/Rpmdrake/edit_urpm_sources.pm
+++ b/Rpmdrake/edit_urpm_sources.pm
@@ -954,11 +954,11 @@ sub mainwindow() {
 	$mainw->{real_window},
 	[ N("/_File"), undef, undef, undef, '<Branch>' ],
 	[ N("/_File") . N("/_Update"), N("<control>U"), sub { update_callback() and $reread_media->() }, undef, '<Item>', ],
+        [ N("/_File") . N("/Add _media"), N("<control>A"), sub { easy_add_callback_with_mirror() and $reread_media->() }, undef, '<Item>' ],
+        [ N("/_File") . N("/_Add a custom medium"), N("<control>A"), sub { add_callback() and $reread_media->() }, undef, '<Item>' ],
 	[ N("/_File") . N("/Close"), N("<control>W"), sub { Gtk2->main_quit }, undef, '<Item>', ],
      [ N("/_Options"), undef, undef, undef, '<Branch>' ],
      [ N("/_Options") . N("/_Global options"), N("<control>G"), \&options_callback, undef, '<Item>' ],
-     [ N("/_Options") . N("/Add _media"), N("<control>A"), sub { easy_add_callback_with_mirror() and $reread_media->() }, undef, '<Item>' ],
-     [ N("/_Options") . N("/_Add a custom medium"), N("<control>A"), sub { add_callback() and $reread_media->() }, undef, '<Item>' ],
      [ N("/_Options") . N("/Manage _keys"), N("<control>K"), \&keys_callback, undef, '<Item>' ],
      [ N("/_Options") . N("/_Parallel"), N("<control>P"), \&parallel_callback, undef, '<Item>' ],
      [ N("/_Options") . N("/P_roxy"), N("<control>R"), \&proxy_callback, undef, '<Item>' ],
-- 
cgit v1.2.1