Hello community, here is the log from the commit of package unison checked in at Thu Dec 14 02:06:06 CET 2006. -------- --- unison/unison.changes 2006-12-06 22:56:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/unison/unison.changes 2006-12-13 16:02:33.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 13 16:01:52 CET 2006 - mhopf@suse.de + +- added patch for no longer closing main window if subwindows open +- removed unison-gtk1 again + +------------------------------------------------------------------- Old: ---- unison-gtk1.changes unison-gtk1.desktop unison-gtk1.spec New: ---- unison-windowout.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unison.spec ++++++ --- /var/tmp/diff_new_pack.ijyDGw/_old 2006-12-14 02:05:55.000000000 +0100 +++ /var/tmp/diff_new_pack.ijyDGw/_new 2006-12-14 02:05:55.000000000 +0100 @@ -16,10 +16,11 @@ Group: Productivity/Networking/Other Autoreqprov: on Version: 2.17.1 -Release: 20 +Release: 23 Source0: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}.tar.gz Source1: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}-manual.html Source2: %name.desktop +Patch0: unison-windowout.diff URL: http://www.cis.upenn.edu/~bcpierce/unison BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A file synchronization tool @@ -39,6 +40,7 @@ %prep %setup -q +%patch0 %build %ifarch s390 s390x @@ -68,6 +70,9 @@ %{_bindir}/%{name} %changelog -n unison +* Wed Dec 13 2006 - mhopf@suse.de +- added patch for no longer closing main window if subwindows open +- removed unison-gtk1 again * Wed Dec 06 2006 - seife@suse.de - add unison-gtk1, a binary compiled against lablgtk * Mon Sep 25 2006 - mhopf@suse.de ++++++ unison-windowout.diff ++++++ Index: uigtk2.ml =================================================================== --- uigtk2.ml (revision 184) +++ uigtk2.ml (revision 185) @@ -1118,10 +1118,9 @@ (* ------ *) -let messageBox ~title ~parent ?(action = fun t -> t#destroy) - ?(modal = false) message = +let messageBox ~title ?(action = fun t -> t#destroy) ?(modal = false) message = let utitle = transcode title in - let t = GWindow.dialog ~title:utitle ~parent ~modal ~position:`CENTER () in + let t = GWindow.dialog ~title:utitle ~modal ~position:`CENTER () in let t_dismiss = GButton.button ~stock:`CLOSE ~packing:t#action_area#add () in t_dismiss#grab_default (); ignore (t_dismiss#connect#clicked ~callback:(action t)); @@ -1156,7 +1155,7 @@ ~selectable:true ~yalign:0. ~packing:v1#add ()); t#add_button_stock `CANCEL `NO; let cmd () = - messageBox ~title:"Details" ~parent:t ~modal:false longtext + messageBox ~title:"Details" ~modal:false longtext in t#add_button advLabel `HELP; t#add_button_stock `APPLY `YES; @@ -1381,10 +1380,11 @@ GBin.frame ~packing:(toplevelVBox#pack ~expand:false) ~shadow_type:`IN (*~hpolicy:`AUTOMATIC ~vpolicy:`NEVER*) () in let hb =GPack.hbox ~packing:sw#add () in - (GButton.button ~label:"View details..." ~packing:hb#add (), + (GButton.button ~label:"View details..." ~packing:(hb#pack ~expand:false) (), GText.view ~editable:false ~wrap_mode:`NONE ~packing:hb#add ()) in + showDetailsButton#misc#set_sensitive false; detailsWindow#misc#modify_font (Lazy.force fontMonospaceMediumPango); detailsWindow#misc#set_size_chars ~height:3 ~width:104 (); detailsWindow#misc#set_can_focus false; @@ -1396,7 +1396,7 @@ (match !theState.(row).whatHappened with Some (Util.Failed _, Some det) -> det | _ -> "[No details available]") in - messageBox ~title:"Merge execution details" ~parent:(getMyWindow ()) details + messageBox ~title:"Merge execution details" details in ignore (showDetailsButton#connect#clicked ~callback:showDetCommand); @@ -2075,7 +2075,7 @@ Some i -> getLock (fun () -> Uicommon.showDiffs !theState.(i).ri - (fun title text -> messageBox ~title ~parent:(getMyWindow ()) (transcode text)) + (fun title text -> messageBox ~title (transcode text)) Trace.status (Uutil.File.ofLine i); displayGlobalProgress 0.) | None -> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org