Rev 146: Move more code to top-level directory. in file:///home/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///home/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 146
revision-id: jelmer at samba.org-20070203115213-qz5549tkrt2wsz05
parent: jelmer at samba.org-20070203105101-kizl0u7o4xc7phgy
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2007-02-03 12:52:13 +0100
message:
  Move more code to top-level directory. 
  Import (last proposed) logo for Bazaar.
added:
  bzr-icon-64.png                bzricon64.png-20070203114947-qf8qxinhjohe3yrt-1
renamed:
  annotate/logview.py => logview.py logview.py-20051024072750-4d5c28cb73611027
  olive/revbrowser.py => revbrowser.py revbrowser.py-20070201094155-v2139s0zp4mmolvq-1
modified:
  __init__.py                    __init__.py-20060519165329-a1fd52c8a829fcd5
  annotate/gannotate.py          xannotate.py-20051024072750-fe35acd6bb909bd3
  revbrowser.py                  revbrowser.py-20070201094155-v2139s0zp4mmolvq-1
=== added file 'bzr-icon-64.png'
Binary files a/bzr-icon-64.png	1970-01-01 00:00:00 +0000 and b/bzr-icon-64.png	2007-02-03 11:52:13 +0000 differ
=== renamed file 'annotate/logview.py' => 'logview.py'
=== renamed file 'olive/revbrowser.py' => 'revbrowser.py'
--- a/olive/revbrowser.py	2007-02-01 09:42:15 +0000
+++ b/revbrowser.py	2007-02-03 11:52:13 +0000
@@ -22,7 +22,6 @@
 
 import gobject
 import gtk
-import gtk.glade
 
 from bzrlib.osutils import format_date
 

=== modified file '__init__.py'
--- a/__init__.py	2007-02-03 10:51:01 +0000
+++ b/__init__.py	2007-02-03 11:52:13 +0000
@@ -52,6 +52,10 @@
 
 check_bzrlib_version(version_info[:2])
 
+from bzrlib.trace import warning
+if __name__ != 'bzrlib.plugins.gtk':
+    warning("Not running as bzrlib.plugins.gtk, things may break.")
+
 from bzrlib import errors
 from bzrlib.commands import Command, register_command, display_command
 from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile

=== modified file 'annotate/gannotate.py'
--- a/annotate/gannotate.py	2007-02-03 10:25:09 +0000
+++ b/annotate/gannotate.py	2007-02-03 11:52:13 +0000
@@ -28,7 +28,7 @@
 from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
 
 from colormap import AnnotateColorMap, AnnotateColorSaturation
-from logview import LogView
+from bzrlib.plugins.gtk.logview import LogView
 
 
 (