[Pkg-bazaar-commits] ./bzr-gtk/unstable r599: Merge of Olive homepage fix + test-gtk removal

[Jasper Groenewegen]

------------------------------------------------------------
revno: 599
committer: Jasper Groenewegen <colbrac at xs4all.nl>
branch nick: trunk
timestamp: Thu 2008-08-14 00:43:04 +0200
message:
  Merge of Olive homepage fix + test-gtk removal
modified:
  NEWS
  __init__.py
  olive/__init__.py
    ------------------------------------------------------------
    revno: 597.2.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2008-08-06 01:21:16 +0200
    message:
      Fix Olive homepage URL.
    modified:
      NEWS
      olive/__init__.py
    ------------------------------------------------------------
    revno: 597.2.2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2008-08-06 16:35:28 +0200
    message:
      Merge trunk.
    modified:
      olive-gtk.desktop
    ------------------------------------------------------------
    revno: 597.2.3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2008-08-06 16:35:39 +0200
    message:
      Remove obsolete test-gtk command - use selftest --starting-with=bzrlib.plugins.gtk now.
    modified:
      __init__.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-08-04 21:39:55 +0000
+++ b/NEWS	2008-08-05 23:21:16 +0000
@@ -8,6 +8,10 @@
  
   * Add ginfo command line option (Jasper Groenewegen)
 
+ BUG FIXES
+
+  * Fix Olive homepage URL. (#255152)
+
 0.95.0	2008-08-04
 
  UI

=== modified file '__init__.py'
--- a/__init__.py	2008-08-04 20:03:36 +0000
+++ b/__init__.py	2008-08-06 14:35:39 +0000
@@ -627,69 +627,6 @@
 register_command(cmd_gselftest)
 
 
-class cmd_test_gtk(GTKCommand):
-    """Version of selftest that just runs the gtk test suite."""
-
-    takes_options = ['verbose',
-                     Option('one', short_name='1',
-                            help='Stop when one test fails.'),
-                     Option('benchmark', help='Run the benchmarks.'),
-                     Option('lsprof-timed',
-                     help='Generate lsprof output for benchmarked'
-                          ' sections of code.'),
-                     Option('list-only',
-                     help='List the tests instead of running them.'),
-                     Option('randomize', type=str, argname="SEED",
-                     help='Randomize the order of tests using the given'
-                          ' seed or "now" for the current time.'),
-                    ]
-    takes_args = ['testspecs*']
-
-    def run(self, verbose=None, one=False, benchmark=None,
-            lsprof_timed=None, list_only=False, randomize=None,
-            testspecs_list=None):
-        from bzrlib import __path__ as bzrlib_path
-        from bzrlib.tests import selftest
-
-        print '%10s: %s' % ('bzrlib', bzrlib_path[0])
-        if benchmark:
-            print 'No benchmarks yet'
-            return 3
-
-            test_suite_factory = bench_suite
-            if verbose is None:
-                verbose = True
-            # TODO: should possibly lock the history file...
-            benchfile = open(".perf_history", "at", buffering=1)
-        else:
-            test_suite_factory = test_suite
-            if verbose is None:
-                verbose = False
-            benchfile = None
-
-        if testspecs_list is not None:
-            pattern = '|'.join(testspecs_list)
-        else:
-            pattern = ".*"
-
-        try:
-            result = selftest(verbose=verbose,
-                              pattern=pattern,
-                              stop_on_failure=one,
-                              test_suite_factory=test_suite_factory,
-                              lsprof_timed=lsprof_timed,
-                              bench_history=benchfile,
-                              list_only=list_only,
-                              random_seed=randomize,
-                             )
-        finally:
-            if benchfile is not None:
-                benchfile.close()
-
-register_command(cmd_test_gtk)
-
-
-
 import gettext
 gettext.install('olive-gtk')
 

=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2008-08-04 21:38:05 +0000
+++ b/olive/__init__.py	2008-08-05 23:21:16 +0000
@@ -60,16 +60,14 @@
     """ Display the AboutDialog. """
     from bzrlib.plugins.gtk import __version__, icon_path
     
-    iconpath = icon_path() + os.sep
-    
     dialog = gtk.AboutDialog()
     dialog.set_name("Olive")
     dialog.set_version(__version__)
-    dialog.set_copyright("Copyright (C) 2006 Szilveszter Farkas (Phanatic)")
-    dialog.set_website("https://launchpad.net/products/olive")
-    dialog.set_website_label("https://launchpad.net/products/olive")
-    dialog.set_icon_from_file(iconpath+"oliveicon2.png")
-    dialog.set_logo(gtk.gdk.pixbuf_new_from_file(iconpath+"oliveicon2.png"))
+    dialog.set_copyright("Copyright (C) 2006-2008 Szilveszter Farkas (Phanatic)")
+    dialog.set_website("https://launchpad.net/bzr-gtk")
+    dialog.set_website_label("https://launchpad.net/bzr-gtk")
+    dialog.set_icon_from_file(icon_path("oliveicon2.png"))
+    dialog.set_logo(gtk.gdk.pixbuf_new_from_file(icon_path("oliveicon2.png")))
     dialog.set_authors([ _i18n("Lead Developer:"),
 			 "Szilveszter Farkas <szilveszter.farkas at gmail.com>",
 			 _i18n("Contributors:"),
@@ -83,6 +81,7 @@
     # Destroy the dialog
     dialog.destroy()
 
+
 class OliveGtk:
     """ The main Olive GTK frontend class. This is called when launching the
     program. """