glibmm r640 - in trunk: . gio/src
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: glibmm r640 - in trunk: . gio/src
- Date: Mon, 10 Mar 2008 19:28:20 +0000 (GMT)
Author: murrayc
Date: Mon Mar 10 19:28:20 2008
New Revision: 640
URL: http://svn.gnome.org/viewvc/glibmm?rev=640&view=rev
Log:
Increased version
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.in
trunk/gio/src/gio_signals.defs
trunk/gio/src/themedicon.ccg
trunk/gio/src/themedicon.hg
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Mon Mar 10 19:28:20 2008
@@ -1,3 +1,15 @@
+2.16.0 (stable):
+
+Changes compared to glibmm 2.14:
+
+* New Gio API. Check for giomm-2.4 with pkg-config to use this.
+ (Marko Anastasov, Jonathon Jongsma, Josà Alburquerque, Murray Cumming)
+* New Glib::Checksum class.
+ (Naveen Verma, Murray Cumming)
+* New uri helper functions: uri_unescape_string(), uri_parse_scheme(),
+ uri_escape_string().
+ (Murray Cumming)
+
2.15.8 (unstable):
* File: load_contents(), load_contents_finish(), load_partial_contents_finish():
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Mon Mar 10 19:28:20 2008
@@ -13,8 +13,8 @@
#
pushdef([GLIBMM_MAJOR_VERSION], [2])
-pushdef([GLIBMM_MINOR_VERSION], [15])
-pushdef([GLIBMM_MICRO_VERSION], [8])
+pushdef([GLIBMM_MINOR_VERSION], [16])
+pushdef([GLIBMM_MICRO_VERSION], [0])
pushdef([GLIBMM_EXTRA_VERSION], [])
pushdef([GLIBMM_VERSION], GLIBMM_MAJOR_VERSION.GLIBMM_MINOR_VERSION.GLIBMM_MICRO_VERSION[]GLIBMM_EXTRA_VERSION)
@@ -131,7 +131,7 @@
# Dependancy checks
#########################################################################
gtkmm_min_sigc_version=2.0.0
-gtkmm_min_glib_version=2.15.6
+gtkmm_min_glib_version=2.16.0
PKG_CHECK_MODULES(GLIBMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version})
AC_SUBST(GLIBMM_CFLAGS)
Modified: trunk/gio/src/gio_signals.defs
==============================================================================
--- trunk/gio/src/gio_signals.defs (original)
+++ trunk/gio/src/gio_signals.defs Mon Mar 10 19:28:20 2008
@@ -297,6 +297,33 @@
;; From GThemedIcon
+(define-property name
+ (of-object "GThemedIcon")
+ (prop-type "GParamString")
+ (docs "The name of the icon")
+ (readable #f)
+ (writable #t)
+ (construct-only #t)
+)
+
+(define-property names
+ (of-object "GThemedIcon")
+ (prop-type "GParamBoxed")
+ (docs "An array containing the icon names")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
+(define-property use-default-fallbacks
+ (of-object "GThemedIcon")
+ (prop-type "GParamBoolean")
+ (docs "Whether to use default fallbacks found by shortening the name at '-' characters. Ignores names after the first if multiple names are given.")
+ (readable #f)
+ (writable #t)
+ (construct-only #t)
+)
+
;; From GVolume
;; From GVolumeMonitor
Modified: trunk/gio/src/themedicon.ccg
==============================================================================
--- trunk/gio/src/themedicon.ccg (original)
+++ trunk/gio/src/themedicon.ccg Mon Mar 10 19:28:20 2008
@@ -18,3 +18,14 @@
*/
#include <gio/gio.h>
+
+namespace Gio
+{
+
+ThemedIcon::ThemedIcon(const std::string& iconname, bool use_default_callbacks)
+:
+ _CONSTRUCT("name", iconname.c_str(), "use-default-fallbacks", gboolean(use_default_callbacks))
+{}
+
+
+} //namespace Gio
Modified: trunk/gio/src/themedicon.hg
==============================================================================
--- trunk/gio/src/themedicon.hg (original)
+++ trunk/gio/src/themedicon.hg Mon Mar 10 19:28:20 2008
@@ -47,13 +47,13 @@
_IMPLEMENTS_INTERFACE(Icon)
protected:
- _WRAP_CTOR(ThemedIcon(const std::string& iconname), g_themed_icon_new)
+ //TODO: Documentation:
+ explicit ThemedIcon(const std::string& iconname, bool use_default_callbacks = false);
+ _IGNORE(g_themed_icon_new, g_themed_icon_new_with_default_fallbacks)
public:
- _WRAP_CREATE(const std::string& iconname)
+ _WRAP_CREATE(const std::string& iconname, bool use_default_callbacks = false)
- //See http://bugzilla.gnome.org/show_bug.cgi?id=517676 about the constructors. murrayc.
- //TODO: GIcon *g_themed_icon_new_with_default_fallbacks (const char *iconname);
//TODO: GIcon *g_themed_icon_new_from_names (char **iconnames, int len);
_WRAP_METHOD(void append_name(const std::string& iconname), g_themed_icon_append_name)
@@ -63,7 +63,11 @@
//_WRAP_METHOD(Glib::StringArrayHandle get_names() const, g_themed_icon_get_names)
- //There are no signals or properties.
+ //There are no signals.
+
+ _WRAP_PROPERTY("name", std::string)
+ //An array: This is awkward to wrap_WRAP_PROPERTY("names", )
+ _WRAP_PROPERTY("use-default-fallbacks", bool)
};
} // namespace Gio
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]