diff -ur terminator-0.9-orig/terminatorlib/terminator.py terminator-0.9/terminatorlib/terminator.py --- terminator-0.9-orig/terminatorlib/terminator.py 2008-07-31 09:25:47.000000000 +0200 +++ terminator-0.9/terminatorlib/terminator.py 2008-07-31 09:48:20.000000000 +0200 @@ -51,7 +51,8 @@ self._button.set_name("terminator-tab-close-button") self.connect("style-set", self.on_style_set) - self._button.set_tooltip_text(_("Close Tab")) + if not terminator.gtk_legacy_mode: + self._button.set_tooltip_text(_("Close Tab")) self.pack_start(self._button, False, False) self.show_all() @@ -171,6 +172,11 @@ if colormap: self.window.set_colormap(colormap) + self.gtk_legacy_mode = False + if (not hasattr(gtk.Notebook, 'set_tab_reorderable') or + not hasattr(gtk.Button, 'set_tooltip_text')): + self.gtk_legacy_mode = True + # Start out with just one terminal # FIXME: This should be really be decided from some kind of profile term = (TerminatorTerm (self, self.profile, self.command)) @@ -465,9 +471,10 @@ #no notebook yet. notebook = gtk.Notebook() #notebook.set_tab_pos(gtk.POS_TOP) - notebook.connect('page-reordered',self.on_page_reordered) + if not self.gtk_legacy_mode: + notebook.connect('page-reordered',self.on_page_reordered) + notebook.set_tab_reorderable(widget, True) notebook.set_property('homogeneous', True) - notebook.set_tab_reorderable(widget, True) if isinstance(parent, gtk.Paned): if parent.get_child1() == child: @@ -479,7 +486,10 @@ elif isinstance(parent, gtk.Window): child.reparent(notebook) parent.add(notebook) - notebook.set_tab_reorderable(child,True) + + if not self.gtk_legacy_mode: + notebook.set_tab_reorderable(child,True) + notebooklabel = "" if isinstance(child, TerminatorTerm): child._titlebox.hide() @@ -513,7 +523,8 @@ notebooktablabel = TerminatorNotebookTabLabel(notebooklabel, notebook, self) notebook.set_tab_label(terminal, notebooktablabel) notebook.set_tab_label_packing(terminal, True, True, gtk.PACK_START) - notebook.set_tab_reorderable(terminal,True) + if not self.gtk_legacy_mode: + notebook.set_tab_reorderable(terminal,True) ## Now, we set focus on the new term notebook.set_current_page(-1) terminal._vte.grab_focus () @@ -897,4 +908,3 @@ self.old_parent.set_current_page(self.old_page) widget._vte.grab_focus () - diff -ur terminator-0.9-orig/terminatorlib/terminatorterm.py terminator-0.9/terminatorlib/terminatorterm.py --- terminator-0.9-orig/terminatorlib/terminatorterm.py 2008-07-31 09:25:47.000000000 +0200 +++ terminator-0.9/terminatorlib/terminatorterm.py 2008-07-31 09:52:53.000000000 +0200 @@ -89,6 +89,12 @@ self._vte = vte.Terminal () self._vte.set_size (80, 24) + + self._vte_legacy_mode = False + if (not hasattr(self._vte, 'is_composited') + or not hasattr(self,_vte, 'set_background_transparent')): + self._vte_legacy_mode = True + self.reconfigure_vte () self._vte.show () @@ -141,7 +147,8 @@ if self.conf.copy_on_selection: self._vte.connect ("selection-changed", lambda widget: self._vte.copy_clipboard ()) - self._vte.connect ("composited-changed", self.on_composited_changed) + if not self._vte_legacy_mode: + self._vte.connect ("composited-changed", self.on_composited_changed) self._vte.connect ("window-title-changed", self.on_vte_title_change) self._vte.connect ("grab-focus", self.on_vte_focus) self._vte.connect ("focus-out-event", self.on_vte_focus_out) @@ -493,12 +500,14 @@ if background_type in ("image", "transparent"): self._vte.set_background_tint_color (bg_color) self._vte.set_background_saturation(1 - (self.conf.background_darkness)) - self._vte.set_opacity(int(self.conf.background_darkness * 65535)) + if not self._vte_legacy_mode: + self._vte.set_opacity(int(self.conf.background_darkness * 65535)) else: self._vte.set_background_saturation(1) - self._vte.set_opacity(65535) + if not self._vte_legacy_mode: + self._vte.set_opacity(65535) - if not self._vte.is_composited(): + if self._vte_legacy_mode or not self._vte.is_composited(): self._vte.set_background_transparent (background_type == "transparent") else: self._vte.set_background_transparent (False) @@ -928,4 +937,3 @@ def destroy(self): self._vte.destroy() -