Merge lp:~muktupavels/compiz/fix-few-typos into lp:compiz/0.9.13

[Alberts Muktupāvels]

ccsm: fix few typos.

Fix few typos.

[Dmitry Shachnev (mitya57)]

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Ack

review: Approve

=== modified file 'compizconfig/ccsm/ccm/Conflicts.py'
--- compizconfig/ccsm/ccm/Conflicts.py	2018-07-11 21:59:31 +0000
+++ compizconfig/ccsm/ccm/Conflicts.py	2018-07-16 23:36:27 +0000
@@ -519,4 +519,3 @@
             return answer, choice
         
         return answer
-        e

=== modified file 'compizconfig/ccsm/ccm/Widgets.py'
--- compizconfig/ccsm/ccm/Widgets.py	2018-07-12 14:41:42 +0000
+++ compizconfig/ccsm/ccm/Widgets.py	2018-07-16 23:36:27 +0000
@@ -78,7 +78,7 @@
         Gtk.CellRenderer.__init__(self)
 
     def _parse_color(self):
-        color = Gdk.Color_parse(self._text[:-4])
+        color = Gdk.Color.parse(self._text[:-4])
         alpha = int("0x%s" % self._text[-4:], base=16)
         self._color = [color.red/65535.0, color.green/65535.0, color.blue/65535.0, alpha/65535.0]
 
@@ -155,7 +155,7 @@
         for plugin in sorted(plugins.values(), key=PluginKeyFunc):
             liststore.append([plugin.ShortDesc, Image(plugin.Name, type=ImagePlugin).props.pixbuf, 
                 plugin.Enabled, plugin])
-        
+
         self.insert_column_with_attributes(0, _('Plugin'), Gtk.CellRendererPixbuf(), pixbuf=1, sensitive=2)
         column = self.get_column(0)
 
@@ -1278,7 +1278,7 @@
             return
         try:
             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size (path, 128, 128)
-        except gobject.GError:
+        except GObject.GError:
             return
         widget.get_preview_widget ().set_from_pixbuf (pixbuf)