[meld] Rename the new comparison dialog's notebook for gtk.Builder uniqueness

[Kai Willadsen <kaiw src gnome org>]

commit 113c0ee549dc34f0d19e5e539fe37c3b6997d347
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Sep 5 07:35:58 2010 +1000

    Rename the new comparison dialog's notebook for gtk.Builder uniqueness

 data/ui/meldapp.glade |    2 +-
 meld/meldapp.py       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/data/ui/meldapp.glade b/data/ui/meldapp.glade
index ba154ae..32e1e35 100644
--- a/data/ui/meldapp.glade
+++ b/data/ui/meldapp.glade
@@ -106,7 +106,7 @@ Adam Weinberger (en_CA)</property>
       <widget class="GtkVBox" id="vbox">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkNotebook" id="notebook">
+          <widget class="GtkNotebook" id="type_notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
diff --git a/meld/meldapp.py b/meld/meldapp.py
index f054e49..f2f02c3 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -84,7 +84,7 @@ class NewDocDialog(gnomeglade.Component):
 
     def on_response(self, dialog, arg):
         if arg == gtk.RESPONSE_OK:
-            page = self.notebook.get_current_page()
+            page = self.type_notebook.get_current_page()
             paths = [e.get_full_path() or "" for e in self.entrylists[page]]
             if page < 2 and not self.three_way_compare[page].get_active():
                 paths.pop(0)