[d-feet: 30/31] Merge branch 'pygi'

[Thomas Bechtold <toabctl src gnome org>]

commit 70c4bfa05bb5f298ab98be8e86bedf830cb9aed4
Merge: 74a178d 74f93b8
Author: Thomas Bechtold <thomasbechtold jpberlin de>
Date:   Tue Oct 16 00:41:52 2012 +0200

    Merge branch 'pygi'

 .gitignore                       |    2 +-
 AUTHORS                          |    2 +
 HACKING                          |    2 +-
 MANIFEST.in                      |    2 +-
 README                           |    8 +-
 TODO                             |   10 +
 d-feet                           |   12 +-
 d-feet.doap                      |    3 +
 dfeet/DFeetApp.py                |  314 +++++++-----------
 dfeet/_introspect_parser.py      |  150 ---------
 dfeet/_ui/__init__.py            |    2 +-
 dfeet/_ui/addconnectiondialog.py |   64 +++--
 dfeet/_ui/busbox.py              |   95 ------
 dfeet/_ui/busnamebox.py          |   65 ----
 dfeet/_ui/busnameinfobox.py      |  157 ---------
 dfeet/_ui/busnameview.py         |  162 ---------
 dfeet/_ui/executemethoddialog.py |  158 +++++----
 dfeet/_ui/uiloader.py            |   44 ++-
 dfeet/_ui/wnck_utils.py          |   10 +-
 dfeet/_util.py                   |   32 --
 dfeet/bus_watch.py               |  260 +++++++++++++++
 dfeet/dbus_introspector.py       |  530 -----------------------------
 dfeet/dbus_utils.py              |   21 +-
 dfeet/introspect_data.py         |  680 --------------------------------------
 dfeet/introspection.py           |  267 +++++++++++++++
 dfeet/introspection_helper.py    |  202 +++++++++++
 dfeet/settings.py                |    8 +-
 setup.py                         |    2 +-
 tests/tests.py                   |  103 ++++++
 tests/uifile_tests.py            |   33 --
 ui/addconnectiondialog.ui        |   63 +++--
 ui/buswatch.ui                   |  221 ++++++++++++
 ui/default-actiongroup.ui        |   99 ------
 ui/executedialog.ui              |  430 ++++++++++++++++++++----
 ui/filterbox.ui                  |   52 ---
 ui/introspection.ui              |  222 +++++++++++++
 ui/introspectview.ui             |  118 -------
 ui/mainwindow.ui                 |  207 +++++++++---
 ui/test-actions.ui               |   16 -
 39 files changed, 2171 insertions(+), 2657 deletions(-)
---
diff --cc .gitignore
index ece167e,a888202..c84d903
--- a/.gitignore
+++ b/.gitignore
@@@ -1,11 -1,3 +1,11 @@@
 +.gdbhistory
  *.pyc
 +*.swp
  *~
 +*.orig
+ \#*#
 +log
 +d_feet.egg-info/
 +test/
 +dist/
 +build/
- 
diff --cc HACKING
index 0a35e1a,0000000..3570a5e
mode 100644,000000..100644
--- a/HACKING
+++ b/HACKING
@@@ -1,15 -1,0 +1,15 @@@
 +Making a release
 +================
 +
 +1. Make sure setup.py has the right version number, fix it in a pre-release
 +   commit if not.
 +2. Update NEWS, use the command: git log --format="- %s (%an)"
 +3. Tag with: git tag -s 0.1.14
 +4. Build tarball with: python setup.py clean; python setup.py sdist
 +6. Upload tarball: scp dist/d-feet-0.1.14.tar.gz johnp master gnome org:
 +7. Install tarball: ssh john master gnome org 'ftpadmin install d-feet-0.1.14.tar.gz'
 +8. update the wiki at https://live.gnome.org/DFeet
- 9. blog about it if you would like 
++9. blog about it if you would like
 +10. Make post-release version bump
 +
 +Based on http://live.gnome.org/MaintainersCorner/Releasing
diff --cc MANIFEST.in
index 70766eb,9b6e762..47109e5
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@@ -1,6 -1,6 +1,6 @@@
  include AUTHORS COPYING NEWS 
- recursive-include ui *.ui *.desktop 
 -recursive-include ui *.png *.ui *.desktop 
 -recursive-include icons *.png
++recursive-include ui *.ui *.desktop
 +recursive-include icons *.png *.svg
  recursive-include locale */LC_MESSAGES/dfeet.mo
  recursive-include help *.omf *.xml *.png
  prune locale/src
diff --cc setup.py
index 1d9a1ee,b180931..ed4837e
--- a/setup.py
+++ b/setup.py
@@@ -10,7 -10,7 +10,7 @@@ from subprocess import 
  import os
  import glob
  
- DFEET_VERSION='0.1.15'
 -DFEET_VERSION='0.1.12'
++DFEET_VERSION='0.3.0'
  
  #Create an array with all the locale filenames
  I18NFILES = []