Hello community, here is the log from the commit of package tomboy checked in at Wed Aug 30 00:07:00 CEST 2006. -------- --- GNOME/tomboy/tomboy.changes 2006-08-17 11:55:06.000000000 +0200 +++ tomboy/tomboy.changes 2006-08-29 19:31:41.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Aug 29 19:29:35 CEST 2006 - jhargadon@suse.de + +- update to version 0.3.9 +- Support building with Gtk# 2 +- New Sticky Notes import plugin +- Note loading code cleanups +- Use Tango icons by default +- Allow icon theming +- Support TOMBOY_PATH environment variable +- Fix recursive HTML note export infinite loop +- Fix Preferences dialog modality +- Locale-friendly dates on printed note footer +- Install Gnome URL handler for note:// +- Improve ToC load time + +------------------------------------------------------------------- Old: ---- tomboy-0.3.3.tar.bz2 New: ---- tomboy-0.3.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomboy.spec ++++++ --- /var/tmp/diff_new_pack.QteQj8/_old 2006-08-30 00:06:52.000000000 +0200 +++ /var/tmp/diff_new_pack.QteQj8/_new 2006-08-30 00:06:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package tomboy (Version 0.3.3) +# spec file for package tomboy (Version 0.3.9) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,15 +11,15 @@ # norootforbuild Name: tomboy -BuildRequires: art-sharp dbus-1-mono dbus-1-x11 gconf-sharp glade-sharp gnome-panel-devel gnome-sharp gtkspell-devel intltool libgnomeprintui-devel mono-basic mono-data-sqlite mono-devel perl-XML-Parser tango-icon-theme update-desktop-files +BuildRequires: art-sharp2 dbus-1-mono dbus-1-x11 gconf-sharp2 glade-sharp glib-sharp2 gnome-doc-utils gnome-panel-devel gnome-sharp2 gtk-sharp2 gtkspell-devel intltool libgnomeprintui-devel libxslt-devel mono-basic mono-data-sqlite mono-devel perl-XML-Parser scrollkeeper tango-icon-theme update-desktop-files %define prefix /usr %define sysconfdir /etc/opt/gnome License: LGPL Group: Productivity/Office/Other Autoreqprov: on Requires: mono -Version: 0.3.3 -Release: 59 +Version: 0.3.9 +Release: 1 Summary: GNOME Note Taking Application URL: http://www.beatniksoftware.com/tomboy/ Source: %{name}-%{version}.tar.bz2 @@ -73,17 +73,17 @@ %patch %patch1 %patch2 -%patch3 -%patch4 +#%patch3 +#%patch4 %patch5 -%patch6 +#%patch6 %patch7 %patch8 %patch9 %patch10 -%patch11 -%patch12 -%patch13 +#%patch11 +#%patch12 +#%patch13 %patch14 %patch15 cp %SOURCE1 data/images/tomboy.png @@ -110,7 +110,8 @@ --sysconfdir=%sysconfdir \ --mandir=%prefix/share/man \ --datadir=/opt/gnome/share \ - --enable-tango=yes + --enable-tango=yes \ + --disable-scrollkeeper make %install @@ -123,7 +124,7 @@ # libtomboy does not export its headers, so it can't be used # outside tomboy package, rm $RPM_BUILD_ROOT/opt/gnome/%_lib/tomboy/*.*a -rm $RPM_BUILD_ROOT/opt/gnome/share/pixmaps/tintin.png +#rm $RPM_BUILD_ROOT/opt/gnome/share/pixmaps/tintin.png %post %run_ldconfig @@ -141,14 +142,31 @@ /opt/gnome/%_lib/pkgconfig/*.pc /opt/gnome/%_lib/bonobo/servers/GNOME_TomboyApplet.server %doc %{prefix}/share/man/man1/%{name}.1.gz -/opt/gnome/share/gnome-2.0/ui/GNOME_TomboyApplet.xml +#/opt/gnome/share/gnome-2.0/ui/GNOME_TomboyApplet.xml /opt/gnome/share/pixmaps/* /opt/gnome/share/icons/hicolor/*/apps/* %{sysconfdir}/gconf/schemas/tomboy.schemas %dir %{prefix}/%_lib/dbus-1.0/services %{prefix}/%_lib/dbus-1.0/services/com.beatniksoftware.Tomboy.service +/opt/gnome/share/applications/DefaultPlugins.desktop +/opt/gnome/share/applications/tomboy.desktop +%dir /opt/gnome/share/omf/tomboy +/opt/gnome/share/omf/tomboy/tomboy-C.omf %changelog -n tomboy +* Tue Aug 29 2006 - jhargadon@suse.de +- update to version 0.3.9 +- Support building with Gtk# 2 +- New Sticky Notes import plugin +- Note loading code cleanups +- Use Tango icons by default +- Allow icon theming +- Support TOMBOY_PATH environment variable +- Fix recursive HTML note export infinite loop +- Fix Preferences dialog modality +- Locale-friendly dates on printed note footer +- Install Gnome URL handler for note:// +- Improve ToC load time * Thu Aug 17 2006 - aj@suse.de - Fix build. - Remove unneeded BuildRequires. ++++++ tomboy-0.3.3.tar.bz2 -> tomboy-0.3.9.tar.bz2 ++++++ ++++ 78652 lines of diff (skipped) ++++++ tomboy-always-handle-args-177298.patch ++++++ --- /var/tmp/diff_new_pack.QteQj8/_old 2006-08-30 00:06:54.000000000 +0200 +++ /var/tmp/diff_new_pack.QteQj8/_new 2006-08-30 00:06:54.000000000 +0200 @@ -1,36 +1,28 @@ Index: Tomboy/Applet.cs -=================================================================== -RCS file: /cvs/gnome/tomboy/Tomboy/Applet.cs,v -retrieving revision 1.15 -diff -u -p -u -r1.15 Applet.cs ---- Tomboy/Applet.cs 23 May 2005 03:37:10 -0000 1.15 -+++ Tomboy/Applet.cs 19 May 2006 21:13:29 -0000 -@@ -40,6 +40,8 @@ namespace Tomboy +================================================================================ +--- Tomboy/Applet.cs ++++ Tomboy/Applet.cs +@@ -42,6 +42,8 @@ tray = new TomboyTray (manager); keybinder = new TomboyGConfXKeybinder (manager, tray); + TomboyCommandLine.ProcessArgs (manager); + - // Register the manager to handle remote requests. - Tomboy.RegisterRemoteControl (manager); + Add (tray); + ShowAll (); -@@ -133,6 +135,8 @@ namespace Tomboy - { +@@ -136,6 +138,8 @@ this.Raw = egg_tray_icon_new (Catalog.GetString ("Tomboy Notes")); this.manager = manager; -+ + + TomboyCommandLine.ProcessArgs (manager); ++ + tray = new TomboyTray (manager); + tray.ButtonPressEvent += ButtonPress; - // Register the manager to handle remote requests. - Tomboy.RegisterRemoteControl (manager); -Index: Tomboy/Tomboy.cs -=================================================================== -RCS file: /cvs/gnome/tomboy/Tomboy/Tomboy.cs,v -retrieving revision 1.17 -diff -u -p -u -r1.17 Tomboy.cs ---- Tomboy/Tomboy.cs 25 Mar 2005 16:50:04 -0000 1.17 -+++ Tomboy/Tomboy.cs 19 May 2006 21:13:29 -0000 -@@ -21,12 +21,13 @@ namespace Tomboy +--- Tomboy/Tomboy.cs ++++ Tomboy/Tomboy.cs +@@ -17,12 +17,13 @@ // Initialize GETTEXT Catalog.Init ("tomboy", Defines.GNOME_LOCALE_DIR); @@ -49,16 +41,16 @@ } program = new Gnome.Program ("Tomboy", -@@ -34,7 +35,7 @@ namespace Tomboy - Gnome.Modules.UI, - args); +@@ -39,7 +40,7 @@ + // Register the manager to handle remote requests. + RegisterRemoteControl (manager); - if (cmd_line.UsePanelApplet) { + if (TomboyCommandLine.UsePanelApplet) { - RegisterPanelAppletFactory (); + RegisterPanelAppletFactory (); } else { - StartTrayIcon (); -@@ -107,24 +108,19 @@ namespace Tomboy + RegisterSessionManagerRestart (args, note_path); +@@ -170,25 +171,20 @@ public class TomboyCommandLine { @@ -74,6 +66,7 @@ + static string open_note_uri; + static string open_note_name; + static string highlight_search; + string note_path; - public TomboyCommandLine (string [] args) - { @@ -91,7 +84,7 @@ { get { return new_note || open_note_name != null || open_note_uri != null; -@@ -172,13 +168,13 @@ namespace Tomboy +@@ -245,13 +241,13 @@ Console.WriteLine (Catalog.GetString ("Version {0}"), Defines.VERSION); } @@ -107,7 +100,7 @@ case "--new-note": // Get optional name for new note... if (idx + 1 < args.Length && args [idx + 1][0] != '-') { -@@ -220,19 +216,6 @@ namespace Tomboy +@@ -293,21 +289,6 @@ ++idx; highlight_search = args [idx]; break; @@ -117,9 +110,11 @@ - case "--start-here": - case "--highlight-search": - string unknown_opt = -- Catalog.GetString ("Tomboy: unsupported option '{0}'\n" + -- "Try 'tomboy --help' for more information.\n" + -- "D-BUS remote control disabled."); +- Catalog.GetString ( +- "Tomboy: unsupported option '{0}'\n" + +- "Try 'tomboy --help' for more " + +- "information.\n" + +- "D-BUS remote control disabled."); - Console.WriteLine (unknown_opt, args [idx]); - quit = true; - break; @@ -127,7 +122,7 @@ case "--panel-applet": panel_applet = true; -@@ -260,12 +243,19 @@ namespace Tomboy +@@ -353,12 +334,19 @@ } } @@ -150,7 +145,7 @@ RemoteControlProxy remote = (RemoteControlProxy) service.GetObject (typeof (RemoteControlProxy), -@@ -296,7 +286,42 @@ namespace Tomboy +@@ -391,7 +379,42 @@ else remote.DisplayNote (open_note_uri); } @@ -165,7 +160,7 @@ +#else + return false; #endif // ENABLE_DBUS -+ } + } + + public static void ProcessArgs (NoteManager manager) + { @@ -190,6 +185,6 @@ + initial_note.Window.Present (); + } + - } ++ } } } ++++++ tomboy-gtk-file-chooser.patch ++++++ --- /var/tmp/diff_new_pack.QteQj8/_old 2006-08-30 00:06:54.000000000 +0200 +++ /var/tmp/diff_new_pack.QteQj8/_new 2006-08-30 00:06:54.000000000 +0200 @@ -7,10 +7,10 @@ using System.Collections; using System.Reflection; +using System.Runtime.InteropServices; + using System.Text; using System.Xml; using System.Xml.XPath; - using System.Xml.Xsl; -@@ -156,18 +157,28 @@ +@@ -193,18 +194,28 @@ } } @@ -43,7 +43,7 @@ ShowAll (); LoadPreferences (default_file); -@@ -179,6 +190,10 @@ +@@ -216,6 +227,10 @@ set { export_linked.Active = value; } } @@ -54,7 +54,7 @@ protected void OnResponseCb (object sender, Gtk.ResponseArgs args) { if (args.ResponseId == Gtk.ResponseType.Ok) -@@ -190,8 +205,9 @@ +@@ -227,8 +242,9 @@ string last_dir = (string) Preferences.Get (Preferences.EXPORTHTML_LAST_DIRECTORY); if (last_dir == "") last_dir = Environment.GetEnvironmentVariable ("HOME"); @@ -66,7 +66,7 @@ ExportLinked = (bool) Preferences.Get (Preferences.EXPORTHTML_EXPORT_LINKED); } -@@ -203,5 +219,35 @@ +@@ -240,5 +256,35 @@ Preferences.Set (Preferences.EXPORTHTML_EXPORT_LINKED, ExportLinked); } ++++++ tomboy-html-export-expose-errors.patch ++++++ --- /var/tmp/diff_new_pack.QteQj8/_old 2006-08-30 00:06:54.000000000 +0200 +++ /var/tmp/diff_new_pack.QteQj8/_new 2006-08-30 00:06:54.000000000 +0200 @@ -8,7 +8,7 @@ ================================================================================ --- Tomboy/Plugins/ExportToHTML.cs +++ Tomboy/Plugins/ExportToHTML.cs -@@ -66,14 +66,16 @@ +@@ -67,14 +67,16 @@ ExportToHTMLDialog dialog = new ExportToHTMLDialog (Note.Title + ".html"); int response = dialog.Run(); string output_path = dialog.Filename; @@ -16,85 +16,84 @@ - if (response != (int) Gtk.ResponseType.Ok) + if (response != (int) Gtk.ResponseType.Ok) { -+ dialog.Destroy (); ++ dialog.Destroy (); return; + } - Console.WriteLine ("Exporting Note '{0}' to '{1}'...", Note.Title, output_path); + Logger.Log ("Exporting Note '{0}' to '{1}'...", Note.Title, output_path); StreamWriter writer = null; + string error_message = null; try { try { // FIXME: Warn about file existing. Allow overwrite. -@@ -84,14 +86,63 @@ +@@ -85,14 +87,62 @@ writer = new StreamWriter (output_path); WriteHTMLForNote (writer, Note, dialog.ExportLinked, dialog.ExportLinkedDepth); - Uri output_uri = new Uri (output_path); - Gnome.Url.Show (output_uri.AbsoluteUri); + // Save the dialog preferences now that the note has successfully been exported -+ dialog.SavePreferences (); -+ dialog.Destroy (); -+ dialog = null; -+ -+ try { -+ Uri output_uri = new Uri (output_path); -+ Gnome.Url.Show (output_uri.AbsoluteUri); -+ } catch (Exception ex) { -+ Console.WriteLine ("Could not open the exported note in a web browser: {0}", ex); -+ -+ // Let the user know the note was saved successfully -+ // even though showing the note in a web browser failed. -+ HIGMessageDialog msg_dialog = -+ new HIGMessageDialog ( -+ Window, -+ Gtk.DialogFlags.DestroyWithParent, -+ Gtk.MessageType.Info, -+ Gtk.ButtonsType.Ok, -+ Catalog.GetString ("Note exported successfully"), -+ String.Format ( -+ Catalog.GetString ("Your note was exported as \"{0}\"."), -+ output_path)); -+ msg_dialog.Run (); -+ msg_dialog.Destroy (); -+ } -+ } catch (UnauthorizedAccessException uae) { -+ error_message = Catalog.GetString ("Access denied."); -+ } catch (DirectoryNotFoundException dnfe) { -+ error_message = Catalog.GetString ("Folder does not exist."); ++ dialog.SavePreferences (); ++ dialog.Destroy (); ++ dialog = null; ++ ++ try { ++ Uri output_uri = new Uri (output_path); ++ Gnome.Url.Show (output_uri.AbsoluteUri); ++ } catch (Exception ex) { ++ Console.WriteLine ("Could not open the exported note in a web browser: {0}", ex); ++ ++ // Let the user know the note was saved successfully+ // even though showing the note in a web browser failed. ++ HIGMessageDialog msg_dialog = ++ new HIGMessageDialog ( ++ Window, ++ Gtk.DialogFlags.DestroyWithParent, ++ Gtk.MessageType.Info, ++ Gtk.ButtonsType.Ok, ++ Catalog.GetString ("Note exported successfully"), ++ String.Format ( ++ Catalog.GetString ("Your note was exported as \"{0}\"."), ++ output_path)); ++ msg_dialog.Run (); ++ msg_dialog.Destroy (); ++ } ++ } catch (UnauthorizedAccessException uae) { ++ error_message = Catalog.GetString ("Access denied."); ++ } catch (DirectoryNotFoundException dnfe) { ++ error_message = Catalog.GetString ("Folder does not exist."); } catch (Exception e) { -- System.Console.WriteLine ("Could not export: {0}", e); +- Logger.Log ("Could not export: {0}", e); + Console.WriteLine ("Could not export: {0}", e); -+ -+ error_message = e.Message; ++ ++ error_message = e.Message; } finally { if (writer != null) writer.Close (); } + -+ if (error_message != null) -+ { -+ Console.WriteLine ("Could not export: {0}", error_message); -+ -+ HIGMessageDialog msg_dialog = -+ new HIGMessageDialog ( -+ dialog, -+ Gtk.DialogFlags.DestroyWithParent, -+ Gtk.MessageType.Error, -+ Gtk.ButtonsType.Ok, -+ String.Format (Catalog.GetString ("Could not save the file \"{0}\""), output_path), -+ error_message); -+ msg_dialog.Run (); -+ msg_dialog.Destroy (); -+ } ++ if (error_message != null) ++ { ++ Console.WriteLine ("Could not export: {0}", error_message); ++ ++ HIGMessageDialog msg_dialog = ++ new HIGMessageDialog ( ++ dialog, ++ Gtk.DialogFlags.DestroyWithParent, ++ Gtk.MessageType.Error, ++ Gtk.ButtonsType.Ok, ++ String.Format (Catalog.GetString ("Could not save the file \"{0}\""), output_path), ++ error_message); ++ msg_dialog.Run (); ++ msg_dialog.Destroy (); ++ } + -+ if (dialog != null) -+ dialog.Destroy (); ++ if (dialog != null) ++ dialog.Destroy (); } - void WriteHTMLForNote (TextWriter writer, -@@ -176,8 +227,6 @@ + public void WriteHTMLForNote (TextWriter writer, +@@ -213,8 +263,6 @@ DefaultResponse = Gtk.ResponseType.Ok; @@ -103,7 +102,7 @@ Gtk.Table table = new Gtk.Table (3, 2, false); export_linked = new Gtk.CheckButton (Catalog.GetString ("Include linked notes")); -@@ -228,10 +277,16 @@ +@@ -265,10 +313,16 @@ get { return gtk_file_chooser_get_filename (this.Handle); } } @@ -123,7 +122,7 @@ } protected void LoadPreferences (string default_file) -@@ -257,18 +312,6 @@ +@@ -294,18 +348,6 @@ export_one_level.Active = true; } ++++++ tomboy-mono-1-1-9.patch ++++++ --- /var/tmp/diff_new_pack.QteQj8/_old 2006-08-30 00:06:54.000000000 +0200 +++ /var/tmp/diff_new_pack.QteQj8/_new 2006-08-30 00:06:54.000000000 +0200 @@ -1,6 +1,6 @@ --- Tomboy/Trie.cs +++ Tomboy/Trie.cs -@@ -138,13 +138,13 @@ +@@ -151,13 +151,13 @@ n = FindMatchAtState (r, m.Value); if (n == null) r = r.Fail; @@ -11,7 +11,7 @@ + } } - if (r != null) { + if (r != null && n != null) { - q1.Fail = n.State; - if (q1.Fail.Final > q1.Final) ++++++ tomboy-null-match-175872.patch ++++++ --- /var/tmp/diff_new_pack.QteQj8/_old 2006-08-30 00:06:54.000000000 +0200 +++ /var/tmp/diff_new_pack.QteQj8/_new 2006-08-30 00:06:54.000000000 +0200 @@ -6,18 +6,15 @@ still be present, but no longer causes a crash. Index: Tomboy/Watchers.cs -=================================================================== -RCS file: /cvs/gnome/tomboy/Tomboy/Watchers.cs,v -retrieving revision 1.37 -diff -u -p -u -r1.37 Watchers.cs ---- Tomboy/Watchers.cs 10 Aug 2005 07:32:15 -0000 1.37 -+++ Tomboy/Watchers.cs 18 May 2006 18:16:27 -0000 -@@ -733,7 +733,7 @@ namespace Tomboy - { - Note match_note = (Note) value; +================================================================================ +--- Tomboy/Watchers.cs ++++ Tomboy/Watchers.cs +@@ -647,7 +647,7 @@ + void DoHighlight (TrieHit hit, Gtk.TextIter start, Gtk.TextIter end) + { + Note hit_note = (Note) hit.Value; +- if (hit_note == this.Note) ++ if (hit_note == this.Note || hit_note == null) + return; -- if (match_note == note) -+ if (match_note == note || match_note == null) - return; - - Gtk.TextIter title_start = start; + Gtk.TextIter title_start = start; ++++++ tomboy-plugins-folder-fixes.patch ++++++ --- /var/tmp/diff_new_pack.QteQj8/_old 2006-08-30 00:06:54.000000000 +0200 +++ /var/tmp/diff_new_pack.QteQj8/_new 2006-08-30 00:06:54.000000000 +0200 @@ -6,39 +6,47 @@ ================================================================================ --- Tomboy/PluginManager.cs +++ Tomboy/PluginManager.cs -@@ -142,21 +142,10 @@ - public void ShowPluginsDirectory () +@@ -174,30 +174,11 @@ { - // Run file manager for ~/.tomboy/Plugins + string command, args; + - // FIXME: There has to be a better way to check this... -- - if (Environment.GetEnvironmentVariable ("GNOME_DESKTOP_SESSION_ID") == null && - (Environment.GetEnvironmentVariable ("KDE_FULL_SESSION") != null || - Environment.GetEnvironmentVariable ("KDEHOME") != null || - Environment.GetEnvironmentVariable ("KDEDIR") != null)) { -- Console.WriteLine ("Starting Konqueror..."); +- Logger.Log ("Starting Konqueror..."); - -- Process.Start ("konqueror", plugins_dir); +- command = "konqueror"; +- args = plugins_dir; - } else { -- Console.WriteLine ("Starting Nautilus..."); +- Logger.Log ("Starting Nautilus..."); - -- string args = string.Format ("--no-desktop --no-default-window {0}", -- plugins_dir); -- Process.Start ("nautilus", args); -+ try { +- command = "nautilus"; +- args = string.Format ("--no-desktop --no-default-window {0}", +- plugins_dir); +- } + + try { +- Process.Start (command, args); +- } catch (SystemException e) { +- Logger.Log ("Error opening file browser \"{0}\" to \"{1}\": {2}", +- command, +- plugins_dir, +- e.Message); + Process.Start ("desktop-launch", "file://" + plugins_dir); + } catch (System.ComponentModel.Win32Exception e) { + Console.WriteLine ("Error starting desktop-launch : {0}", e); } } -@@ -270,6 +259,9 @@ +@@ -311,6 +292,9 @@ void OnPluginCreated (object sender, FileSystemEventArgs args) { + if (args.FullPath == plugins_dir || args.FullPath == Defines.SYS_PLUGINS_DIR) -+ return; ++ return; + - Console.WriteLine ("Plugin '{0}' Created", + Logger.Log ("Plugin '{0}' Created", Path.GetFileName (args.FullPath)); ++++++ tomboy-secure-paths.patch ++++++ --- /var/tmp/diff_new_pack.QteQj8/_old 2006-08-30 00:06:55.000000000 +0200 +++ /var/tmp/diff_new_pack.QteQj8/_new 2006-08-30 00:06:55.000000000 +0200 @@ -1,18 +1,18 @@ --- Tomboy/tomboy.in +++ Tomboy/tomboy.in -@@ -1,18 +1,9 @@ +@@ -1,18 +1,10 @@ -#!/bin/sh +#!/bin/bash -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" -+export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" -+export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@" - export LD_LIBRARY_PATH="../libtomboy/.libs:$LD_LIBRARY_PATH" - export TOMBOY_WRAPPER_PATH="$PWD/@wrapper@" -- -- THIS_EXE="./@target@" ++export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" ++export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@" + +- THIS_EXE="--debug ./@target@" -else - export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH" - export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org