← Back to branch summary

~ubuntu-branches/ubuntu/lucid/tomboy/lucid-proposed

« back to all changes in this revision

Viewing changes to Tomboy/Tomboy.cs

  • Committer: Bazaar Package Importer
  • Author(s): Iain Lane
  • Date: 2009-06-24 09:44:48 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090624094448-38fcffyrmg40pvoi
Tags: 0.15.2-0ubuntu1
https://launchpad.net/bugs/381101
* Upload to Karmic from Debian's git repository due to delays (lp: #381101)
* New upstream release 0.15.1:
 - New WebSync add-in syncs to any server that implements the Tomboy Web REST API,
   such as Snowy [http://live.gnome.org/Snowy].  Baby-eating preview release.
 - Require Mono 1.9.1 to *build* Tomboy. Should still run on older Mono.
 - Prevent PATH problems on Windows from breaking Tomboy.
 - Search for phrases by quoting search text.
 - Fix drag&drop & middle-click paste of linked text.
 - Save width of notebook pane in Search window.
 - Disable sync menu items until backend configured.
 - Close note find bar on escape, even when not focused.
 - Support FUSE being built-in to kernel.
 - Prevent crashes when reading unexpected note XML.
 - Change "Open New Note Template" LinkButton to Button to prevent error.
 - Focus search field every time Search window summoned.
 - Only show Start Here note on first run if not running as applet.
 - HIG compliance in Sync preferences.
 - Use correct "info" icon in add-in info windows.
 - Use relative path to load help.
 - Cache frequently-used text tags in one place instead of five.
 - Documentation updates.
 - Translation updates: el, es, et, gl
* New upstream release 0.15.2:
 - Fix HTML Export on Mac OS X.
 - Translation updates: es, et, nb, sv, zh_CN
* debian/control: Add help/ as GFDL 1.1+ 
* debian/rules: Remove --repack; not necessary as upstream is a .tar.gz and
  could cause rule to be nondeterministic

Show diffs side-by-side

added added

removed removed

Lines of Context:
Tomboy/Tomboy.cs
31
31
 
32
32
                public static void Main (string [] args)
33
33
                {
 
34
                        // TODO: Extract to a PreInit in Application, or something
 
35
#if WIN32
 
36
                        string tomboy_path =
 
37
                                Environment.GetEnvironmentVariable ("TOMBOY_PATH_PREFIX");
 
38
                        string tomboy_gtk_basepath =
 
39
                                Environment.GetEnvironmentVariable ("TOMBOY_GTK_BASEPATH");
 
40
                        Environment.SetEnvironmentVariable ("GTK_BASEPATH",
 
41
                                tomboy_gtk_basepath ?? string.Empty);
 
42
                        if (string.IsNullOrEmpty (tomboy_path)) {
 
43
                                string gtk_lib_path = null;
 
44
                                try {
 
45
                                        gtk_lib_path = (string)
 
46
                                                Microsoft.Win32.Registry.GetValue (@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\AssemblyFolders\GtkSharp",
 
47
                                                                                   string.Empty,
 
48
                                                                                   string.Empty);
 
49
                                } catch (Exception e) {
 
50
                                        Console.WriteLine ("Exception while trying to get GTK# install path: " +
 
51
                                                           e.ToString ());
 
52
                                }
 
53
                                if (!string.IsNullOrEmpty (gtk_lib_path))
 
54
                                        tomboy_path =
 
55
                                                gtk_lib_path.Replace ("lib\\gtk-sharp-2.0", "bin");
 
56
                        }
 
57
                        if (!string.IsNullOrEmpty (tomboy_path))
 
58
                                Environment.SetEnvironmentVariable ("PATH",
 
59
                                                                    tomboy_path +
 
60
                                                                    Path.PathSeparator +
 
61
                                                                    Environment.GetEnvironmentVariable ("PATH"));
 
62
#endif
34
63
                        // Initialize GETTEXT
35
64
                        Catalog.Init ("tomboy", Defines.GNOME_LOCALE_DIR);
36
65
 
37
66
                        TomboyCommandLine cmd_line = new TomboyCommandLine (args);
38
67
                        debugging = cmd_line.Debug;
 
68
                        is_panel_applet = cmd_line.UsePanelApplet;
39
69
 
40
70
#if ENABLE_DBUS || WIN32 || MAC // Run command-line earlier with DBus enabled
41
71
                        if (cmd_line.NeedsExecute) {
79
109
                        }
80
110
#endif
81
111
 
82
 
                        if (cmd_line.UsePanelApplet) {
 
112
                        if (is_panel_applet) {
83
113
                                tray_icon_showing = true;
84
 
                                is_panel_applet = true;
85
114
 
86
115
                                // Show the Close item and hide the Quit item
87
116
                                am ["CloseWindowAction"].Visible = true;