Merge lp:~bregma/geis/lp-903320 into lp:geis

Proposed by Stephen M. Webb on 2011-12-12
Status: Merged
Merged at revision: 181
Proposed branch: lp:~bregma/geis/lp-903320
Merge into: lp:geis
Diff against target: 48 lines (+11/-6)
2 files modified
configure.ac (+1/-1)
tools/geisview/geisview (+10/-5)
To merge this branch: bzr merge lp:~bregma/geis/lp-903320
Reviewer Review Type Date Requested Status
Chase Douglas (community) 2011-12-12 Approve on 2011-12-12
Review via email: mp+85384@code.launchpad.net

Description of the change

Allows geisview to fall back to the XDB back end gracefully if no back end is explicitly requested on the command line.

No test case is required, running geisview with no back end specified and no geis daemon running (the current default situation) yielded no results, geisview with this patch yields results.

To post a comment you must log in.
Chase Douglas (chasedouglas) wrote :

Is the revision bump supposed to be before the fix? If it's a previous revision, how did we release with an older revision?

Stephen M. Webb (bregma) wrote :

On 12/12/2011 03:06 PM, Chase Douglas wrote:
> Is the revision bump supposed to be before the fix? If it's a previous revision, how did we release with an older revision?

I must have forgotten to push up the version bump to lp:utouch-geis when
I released 2.2.2, it should not be a part of this merge request. I've
been using git too much lately, it tells you when your local repo is
ahead of a remote one.

I've pushed the version bump up now, so that part can be ignored for the
purposes of this merge request.

Chase Douglas (chasedouglas) wrote :

Looks sane to me. If I am reading it correctly, instead of assuming the DBUS backend by default it now does not specify a backend. This allows the XCB fallback when the DBUS backend is unavailable.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2011-10-22 03:50:55 +0000
3+++ configure.ac 2011-12-12 19:35:32 +0000
4@@ -21,7 +21,7 @@
5
6 AC_PREREQ(2.65)
7 AC_INIT([utouch-geis],
8- [2.2.1],
9+ [2.2.2],
10 [stephen.webb@canonical.com],,
11 [https://launchpad.net/utouch-geis])
12 AC_CONFIG_HEADERS([geis_config.h])
13
14=== modified file 'tools/geisview/geisview'
15--- tools/geisview/geisview 2011-10-18 20:43:58 +0000
16+++ tools/geisview/geisview 2011-12-12 19:35:32 +0000
17@@ -54,15 +54,20 @@
18 self._builder.add_from_file(os.path.join(geisview.defaults.ui_dir,
19 "geisview.ui"))
20 self._builder.connect_signals(self)
21+ self._args = args;
22
23 self._main_window = self._builder.get_object("main_window")
24 self._filters_dialog = self._builder.get_object("filters_dialog")
25
26- be = _geis_backends.get(args.backend, geis.GEIS_INIT_UTOUCH_DBUS_BACKEND)
27+ be = _geis_backends.get(args.backend, None)
28 try:
29- self._geis = geis.Geis(geis.GEIS_INIT_TRACK_DEVICES,
30- geis.GEIS_INIT_TRACK_GESTURE_CLASSES,
31- be)
32+ if be:
33+ self._geis = geis.Geis(geis.GEIS_INIT_TRACK_DEVICES,
34+ geis.GEIS_INIT_TRACK_GESTURE_CLASSES,
35+ be)
36+ else:
37+ self._geis = geis.Geis(geis.GEIS_INIT_TRACK_DEVICES,
38+ geis.GEIS_INIT_TRACK_GESTURE_CLASSES)
39 except Exception as ex:
40 box = gtk.MessageDialog(None,
41 gtk.DIALOG_MODAL,
42@@ -281,7 +286,7 @@
43 self.add_argument('-w', '--window', action='store', dest='windowid',
44 help=_('indicates the X windowid to receive input'))
45 self.add_argument('-b', '--backend', action='store', dest='backend',
46- choices=_geis_backends.keys(),
47+ choices=_geis_backends.keys(), default=None,
48 help=_('selects the recognizer back end'))
49
50

Subscribers

People subscribed via source and target branches