Hello community, here is the log from the commit of package gtk-sharp2 checked in at Mon Jul 16 07:36:54 CEST 2007. -------- --- GNOME/gtk-sharp2/gtk-sharp2.changes 2007-07-09 20:43:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/gtk-sharp2/gtk-sharp2.changes 2007-07-15 10:07:23.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jul 15 10:06:26 CEST 2007 - aj@suse.de + +- Add fix_callback_code_generator.patch to fix gapi's code + generator for callbacks with out parameters (fixes gmime-sharp). + +------------------------------------------------------------------- New: ---- fix_callback_code_generator.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk-sharp2.spec ++++++ --- /var/tmp/diff_new_pack.Ox3282/_old 2007-07-16 07:36:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Ox3282/_new 2007-07-16 07:36:34.000000000 +0200 @@ -25,6 +25,7 @@ Patch3: gtk-sharp-find_gtkhtml_ver.patch Patch4: gtk-sharp-fix_vte_so_version.patch Patch5: gnome-sharp-revert_unportable_relocatable.patch +Patch6: fix_callback_code_generator.patch %define old_version 2.4.3 %define new_version 2.8.3 %define new_split_version 2.10.1 @@ -246,6 +247,7 @@ %patch4 -p1 %patch5 -p1 %endif +%patch6 -p0 %build %{?env_options} @@ -387,6 +389,9 @@ %endif %changelog +* Sun Jul 15 2007 - aj@suse.de +- Add fix_callback_code_generator.patch to fix gapi's code + generator for callbacks with out parameters (fixes gmime-sharp). * Tue Jul 03 2007 - wberrier@suse.de - Correct time for May 2 entry (failing on s390 machines) - Update to 2.10 for distros with gtk 2.10 (currently this is ++++++ fix_callback_code_generator.patch ++++++ --- generator/CallbackGen.cs +++ generator/CallbackGen.cs @@ -109,7 +109,6 @@ sw.WriteLine (); sw.WriteLine ("\t\tpublic " + retval.MarshalType + " NativeCallback (" + native_sig + ")"); sw.WriteLine ("\t\t{"); - sw.WriteLine ("\t\t\ttry {"); bool need_sep = false; bool throws_error = false; @@ -120,7 +119,7 @@ Parameter p = parms [i]; if (p.CType == "GError**") { - sw.WriteLine ("\t\t\t\t" + p.Name + " = IntPtr.Zero;"); + sw.WriteLine ("\t\t\t" + p.Name + " = IntPtr.Zero;"); throws_error = true; continue; } else if (parms.IsHidden (p)) @@ -131,7 +130,7 @@ sw.Write("\t\t\t\t" + p.CSType + " _arg" + idx); if (p.PassAs == "out") { sw.WriteLine(";"); - cleanup_str += "\t\t\t\t" + p.Name + " = " + gen.CallByName ("_arg" + idx) + ";\n"; + cleanup_str += "\t\t\t" + p.Name + " = " + gen.CallByName ("_arg" + idx) + ";\n"; } else sw.WriteLine(" = " + gen.FromNative (p.Name) + ";"); @@ -145,7 +144,8 @@ bool has_out_params = cleanup_str.Length > 0; cleanup_str += "\t\t\t\tif (release_on_call)\n\t\t\t\t\tgch.Free ();\n"; - + + sw.WriteLine ("\t\t\ttry {"); sw.Write ("\t\t\t\t"); string invoke = "managed (" + call_str + ")"; if (retval.MarshalType != "void") { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org