glom r1656 - in trunk: . glom/libglom

[murrayc svn gnome org]

Author: murrayc
Date: Tue Aug 12 08:03:31 2008
New Revision: 1656
URL: http://svn.gnome.org/viewvc/glom?rev=1656&view=rev

Log:
2008-08-12  Murray Cumming  <murrayc murrayc com>

* glom/libglom/utils.cc:
* glom/libglom/utils.h: show_help() Add a note that this is a replacement 
for gnome_help_display() until we have something in GTK+.

Modified:
   trunk/ChangeLog
   trunk/glom/libglom/utils.cc
   trunk/glom/libglom/utils.h

Modified: trunk/glom/libglom/utils.cc
==============================================================================
--- trunk/glom/libglom/utils.cc	(original)
+++ trunk/glom/libglom/utils.cc	Tue Aug 12 08:03:31 2008
@@ -825,6 +825,7 @@
     show_help(id);
     result = dialog->run();
   }
+
   dialog->hide();
   return result;
 }
@@ -875,7 +876,7 @@
   }
   catch(const std::exception& ex)
   {
-    std::string message(std::string(_("Could not display help: ")) + ex.what());
+    const Glib::ustring message = _("Could not display help: ") + Glib::ustring(ex.what());
     Gtk::MessageDialog dialog(message, false, Gtk::MESSAGE_ERROR);
     dialog.run();
   }

Modified: trunk/glom/libglom/utils.h
==============================================================================
--- trunk/glom/libglom/utils.h	(original)
+++ trunk/glom/libglom/utils.h	Tue Aug 12 08:03:31 2008
@@ -99,6 +99,10 @@
 
 int dialog_run_with_help(Gtk::Dialog* dialog, const Glib::ustring& id = Glib::ustring());
 
+/** This is a replacement for gnome_help_display(), 
+ * to avoid the libgnome dependency.
+ * TODO: GTK+ should have a function for this soon.
+ */
 void show_help(const Glib::ustring& id = Glib::ustring());
 
 void show_ok_dialog(const Glib::ustring& title, const Glib::ustring& message, Gtk::Window& parent, Gtk::MessageType message_type);