nemiver r925 - in trunk: . src/persp/dbgperspective

[asaleem svn gnome org]

Author: asaleem
Date: Fri Sep  5 04:46:30 2008
New Revision: 925
URL: http://svn.gnome.org/viewvc/nemiver?rev=925&view=rev

Log:
update deprecated api to new api

Require GTK+ 2.12 for the new Tooltip API.  Update the TreeModel usage to the
new APIs:

set_sort_column_id -> set_sort_column

Remove unnecessary code.

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc
   trunk/src/persp/dbgperspective/nmv-proc-list-dialog.cc
   trunk/src/persp/dbgperspective/nmv-saved-sessions-dialog.cc

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Sep  5 04:46:30 2008
@@ -32,7 +32,7 @@
 AC_SUBST([LIBGNOMEVFS_VERSION])
 LIBXML2_VERSION=2.6.22
 AC_SUBST([LIBXML2_VERSION])
-LIBGTKMM_VERSION=2.10.0
+LIBGTKMM_VERSION=2.12.0
 AC_SUBST([LIBGTKMM_VERSION])
 LIBGLADEMM_VERSION=2.6.0
 AC_SUBST([LIBGLADEMM_VERSION])

Modified: trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc	Fri Sep  5 04:46:30 2008
@@ -213,7 +213,6 @@
     struct SlotedButton : Gtk::Button {
         UString file_path;
         DBGPerspective *perspective;
-        SafePtr<Gtk::Tooltips> tooltips;
 
         SlotedButton () :
             Gtk::Button (),
@@ -3367,10 +3366,9 @@
     close_button->file_path = a_path;
     close_button->signal_clicked ().connect
             (sigc::mem_fun (*close_button, &SlotedButton::on_clicked));
-    close_button->tooltips.reset (new Gtk::Tooltips);
     UString message;
     message.printf (_("Close %s"), a_path.c_str ());
-    close_button->tooltips->set_tip (*close_button, message);
+    close_button->set_tooltip_text (message);
 
     SafePtr<Gtk::Table> table (Gtk::manage (new Gtk::Table (1, 2)));
     // add a bit of space between the label and the close button
@@ -3381,7 +3379,7 @@
     event_box->add (*label);
     table->attach (*event_box, 0, 1, 0, 1);
     table->attach (*close_button, 1, 2, 0, 1);
-    close_button->tooltips->set_tip (*event_box, a_path);
+    event_box->set_tooltip_text (a_path);
     table->show_all ();
     int page_num = m_priv->sourceviews_notebook->insert_page (a_sv,
                                                               *table,

Modified: trunk/src/persp/dbgperspective/nmv-proc-list-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-proc-list-dialog.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-proc-list-dialog.cc	Fri Sep  5 04:46:30 2008
@@ -115,21 +115,21 @@
         THROW_IF_FAIL (col);
         col->set_clickable (true);
         col->set_resizable (true);
-        col->set_sort_column_id (columns ().pid);
+        col->set_sort_column (columns ().pid);
 
         proclist_view->append_column (_("User Name"), columns ().user_name);
         col = proclist_view->get_column (1);
         THROW_IF_FAIL (col);
         col->set_clickable (true);
         col->set_resizable (true);
-        col->set_sort_column_id (columns ().user_name);
+        col->set_sort_column (columns ().user_name);
 
         proclist_view->append_column (_("Proc Args"), columns ().proc_args);
         col = proclist_view->get_column (2);
         THROW_IF_FAIL (col);
         col->set_clickable (true);
         col->set_resizable (true);
-        col->set_sort_column_id (columns ().proc_args);
+        col->set_sort_column (columns ().proc_args);
 
         proclist_view->get_selection ()->set_mode (Gtk::SELECTION_SINGLE);
         col = proclist_view->get_column (ProcListCols::PID);

Modified: trunk/src/persp/dbgperspective/nmv-saved-sessions-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-saved-sessions-dialog.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-saved-sessions-dialog.cc	Fri Sep  5 04:46:30 2008
@@ -115,10 +115,9 @@
             (treeview_sessions->get_selection ()->count_selected_rows ());
     }
 
-    void on_row_activated (const Gtk::TreeModel::Path& a_path,
-                           Gtk::TreeViewColumn* a_col)
+    void on_row_activated (const Gtk::TreeModel::Path&,
+                           Gtk::TreeViewColumn*)
     {
-        if (a_path.get_depth () || a_col) {}
         dialog.activate_default();
     }
 }; //end struct SavedSessionsDialog::Priv