glibmm r757 - in trunk: . gio/src tools/m4

[jjongsma svn gnome org]

Author: jjongsma
Date: Fri Dec 12 02:43:03 2008
New Revision: 757
URL: http://svn.gnome.org/viewvc/glibmm?rev=757&view=rev

Log:
Add DesktopAppInfo::create_from_keyfile()

Modified:
   trunk/ChangeLog
   trunk/gio/src/desktopappinfo.hg
   trunk/tools/m4/convert_glib.m4

Modified: trunk/gio/src/desktopappinfo.hg
==============================================================================
--- trunk/gio/src/desktopappinfo.hg	(original)
+++ trunk/gio/src/desktopappinfo.hg	Fri Dec 12 02:43:03 2008
@@ -39,13 +39,11 @@
   _IMPLEMENTS_INTERFACE(AppInfo)
   _GTKMMPROC_WIN32_NO_WRAP
 
-protected:
-  _WRAP_CTOR(DesktopAppInfo(const std::string& desktop_id), g_desktop_app_info_new)
-
 public:
-  _WRAP_CREATE(const std::string& desktop_id)
-
-  //TODO: Use _WRAP_CREATE(), but how do we override the constructor for this? murrayc. 
+  // TODO: should use _WRAP_CREATE(), but these functions do more than just call
+  // g_object_new() because there's quite a bit of error-handling to do
+  _WRAP_METHOD(static Glib::RefPtr<DesktopAppInfo> create(const std::string& desktop_id), g_desktop_app_info_new)
+  _WRAP_METHOD(static Glib::RefPtr<DesktopAppInfo> create_from_keyfile(Glib::KeyFile& key_file), g_desktop_app_info_new_from_keyfile)
   _WRAP_METHOD(static Glib::RefPtr<DesktopAppInfo> create_from_filename(const std::string& filename), g_desktop_app_info_new_from_filename)
 
   _WRAP_METHOD(bool is_hidden() const, g_desktop_app_info_get_is_hidden)

Modified: trunk/tools/m4/convert_glib.m4
==============================================================================
--- trunk/tools/m4/convert_glib.m4	(original)
+++ trunk/tools/m4/convert_glib.m4	Fri Dec 12 02:43:03 2008
@@ -75,3 +75,4 @@
 _CONVERSION(`OptionGroup&',`GOptionGroup*',`($3).gobj()')
 #_CONVERSION(`GOptionGroup*',`OptionGroup',`Glib::wrap(($3), true /* take_copy */)')
 
+_CONVERSION(`Glib::KeyFile&',`GKeyFile*',`($3).gobj()')