ibus-gjs-fixes.patch

   1 diff -ur ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/ibusPanel.js ibus-gjs-3.4.1.20120815/js/ui/status/ibus/ibusPanel.js
   2 --- ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/ibusPanel.js 2012-08-15 11:06:54.000000000 +0200
   3 +++ ibus-gjs-3.4.1.20120815/js/ui/status/ibus/ibusPanel.js      2012-11-05 23:50:06.086089865 +0100
   4 @@ -954,8 +954,11 @@
   5      },
   6
   7      _configLoadLookupTableOrientation: function() {
   8 -        let value = this._config.get_value('panel', 'lookup_table_orientation',
   9 -                                           GLib.Variant.new_int32(0)).get_int32();
  10 +        let _value = this._config.get_value('panel', 'lookup_table_orientation',
  11 +                                           GLib.Variant.new_int32(0));
  12 +        let value = 0;
  13 +        if (_value != null)
  14 +                value = _value.get_int32();
  15          let orientation = Common.ORIENTATION_VERTICAL;
  16          if (value in [Common.ORIENTATION_HORIZONTAL,
  17                        Common.ORIENTATION_VERTICAL])
  18 diff -ur ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/panelMenu.js ibus-gjs-3.4.1.20120815/js/ui/status/ibus/panelMenu.js
  19 --- ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/panelMenu.js 2012-08-15 11:06:54.000000000 +0200
  20 +++ ibus-gjs-3.4.1.20120815/js/ui/status/ibus/panelMenu.js      2012-11-05 23:50:06.086089865 +0100
  21 @@ -66,7 +66,6 @@
  22          this._clearActor();
  23          this._iconName = iconName;
  24          this._iconActor = new St.Icon({ icon_name: iconName,
  25 -                                        icon_type: St.IconType.SYMBOLIC,
  26                                          style_class: 'system-status-icon' });
  27          this.actor.add_child(this._iconActor);
  28          this.actor.queue_redraw();
  29 diff -ur ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/switcher.js ibus-gjs-3.4.1.20120815/js/ui/status/ibus/switcher.js
  30 --- ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/switcher.js  2012-08-15 11:06:54.000000000 +0200
  31 +++ ibus-gjs-3.4.1.20120815/js/ui/status/ibus/switcher.js       2012-11-05 23:50:06.086089865 +0100
  32 @@ -713,8 +713,7 @@
  33                  icon.clutter_text.set_font_description(desc);
  34              }));
  35          } else {
  36 -            icon = new St.Icon({ icon_name: engine.icon,
  37 -                                 icon_type: St.IconType.SYMBOLIC });
  38 +            icon = new St.Icon({ icon_name: engine.icon });
  39          }
  40          if (icon != null) {
  41              this._iconBin.child = icon
  42 diff -ur ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/xkbLayout.js.in ibus-gjs-3.4.1.20120815/js/ui/status/ibus/xkbLayout.js.in
  43 --- ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/xkbLayout.js.in      2012-08-15 11:07:22.000000000 +0200
  44 +++ ibus-gjs-3.4.1.20120815/js/ui/status/ibus/xkbLayout.js.in   2012-11-05 23:50:06.086089865 +0100
  45 @@ -68,10 +68,12 @@
  46                      value.get_child_value(i).dup_string()[0]);
  47              }
  48              if (this._useXmodmap) {
  49 -                this._useXmodmap = this._config.get_value(
  50 +                let _value = this._config.get_value(
  51                      'general',
  52                      'use_xmodmap',
  53 -                    GLib.Variant.new_boolean(true)).get_boolean();
  54 +                    GLib.Variant.new_boolean(true));
  55 +                if (_value != null)
  56 +                    this._useXmodmap = _value.get_boolean();
  57              }
  58          }
  59      },