[Galago-commits] r2700 - in trunk/libgalago: . libgalago

galago-commits at freedesktop.org galago-commits at freedesktop.org
Tue Apr 11 00:22:04 PDT 2006


Author: chipx86
Date: 2006-04-11 00:22:00 -0700 (Tue, 11 Apr 2006)
New Revision: 2700

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/NEWS
   trunk/libgalago/configure.ac
   trunk/libgalago/libgalago/galago-account.c
   trunk/libgalago/libgalago/galago-object.c
   trunk/libgalago/libgalago/galago-person.c
   trunk/libgalago/libgalago/galago-presence.c
   trunk/libgalago/libgalago/galago-service.c
   trunk/libgalago/libgalago/galago-status.c
Log:
Patch by Ross Burton to require glib 2.8, and to call g_param_spec_*() with STATIC flags, which saves a bit of memory.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-04-11 07:00:24 UTC (rev 2699)
+++ trunk/libgalago/ChangeLog	2006-04-11 07:22:00 UTC (rev 2700)
@@ -1,3 +1,17 @@
+Tue Apr 11 00:20:37 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-account.c:
+	* libgalago/galago-object.c:
+	* libgalago/galago-person.c:
+	* libgalago/galago-presence.c:
+	* libgalago/galago-service.c:
+	* libgalago/galago-status.c:
+	* NEWS:
+	* configure.ac:
+	  - Patch by Ross Burton to require glib 2.8, and to call
+	    g_param_spec_*() with STATIC flags, which saves a bit of
+	    memory.
+
 Mon Apr 10 23:59:30 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-account.c:

Modified: trunk/libgalago/NEWS
===================================================================
--- trunk/libgalago/NEWS	2006-04-11 07:00:24 UTC (rev 2699)
+++ trunk/libgalago/NEWS	2006-04-11 07:22:00 UTC (rev 2700)
@@ -9,6 +9,7 @@
 	  code that they should know about.
 
 	GLib port:
+		- Requires glib 2.8 or higher.
 		- Replaced the home-brewn object model with GObject.
 		- Removed several utility functions and data structures in favor of
 		  the glib equivalents.

Modified: trunk/libgalago/configure.ac
===================================================================
--- trunk/libgalago/configure.ac	2006-04-11 07:00:24 UTC (rev 2699)
+++ trunk/libgalago/configure.ac	2006-04-11 07:22:00 UTC (rev 2700)
@@ -94,7 +94,7 @@
 AM_GNU_GETTEXT_VERSION(0.10.40)
 AM_GNU_GETTEXT
 
-pkg_modules="glib-2.0 >= 2.4.0, dbus-1 >= 0.36, dbus-glib-1 >= 0.36"
+pkg_modules="glib-2.0 >= 2.8.0, dbus-1 >= 0.36, dbus-glib-1 >= 0.36"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)

Modified: trunk/libgalago/libgalago/galago-account.c
===================================================================
--- trunk/libgalago/libgalago/galago-account.c	2006-04-11 07:00:24 UTC (rev 2699)
+++ trunk/libgalago/libgalago/galago-account.c	2006-04-11 07:22:00 UTC (rev 2700)
@@ -182,39 +182,46 @@
 		g_param_spec_object("service", "Service",
 							"The service the account is on",
 							GALAGO_TYPE_SERVICE,
-							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_PERSON,
 		g_param_spec_object("person", "Person",
 							"The person the account belongs to",
 							GALAGO_TYPE_PERSON,
-							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_PRESENCE,
 		g_param_spec_object("presence", "Presence",
 							"The account's presence",
-							GALAGO_TYPE_PRESENCE, G_PARAM_READABLE));
+							GALAGO_TYPE_PRESENCE, G_PARAM_READABLE |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_AVATAR,
 		g_param_spec_object("avatar", "Avatar",
 							"The account's avatar",
-							GALAGO_TYPE_IMAGE, G_PARAM_READWRITE));
+							GALAGO_TYPE_IMAGE, G_PARAM_READWRITE |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_USERNAME,
 		g_param_spec_string("username", "Username",
 							"The account's username",
 							NULL,
-							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_DISPLAYNAME,
 		g_param_spec_string("display-name", "Display Name",
 							"The account's username intended for display",
-							NULL, G_PARAM_READWRITE));
+							NULL, G_PARAM_READWRITE |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_CONNECTED,
 		g_param_spec_boolean("connected", "Connected",
 							 "The account's connected state",
-							 FALSE, G_PARAM_READWRITE));
+							 FALSE, G_PARAM_READWRITE |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 }
 
 static void

Modified: trunk/libgalago/libgalago/galago-object.c
===================================================================
--- trunk/libgalago/libgalago/galago-object.c	2006-04-11 07:00:24 UTC (rev 2699)
+++ trunk/libgalago/libgalago/galago-object.c	2006-04-11 07:22:00 UTC (rev 2700)
@@ -118,21 +118,24 @@
 	g_object_class_install_property(gobject_class, PROP_CONTEXT,
 		g_param_spec_pointer("context", "Context",
 							 "The GalagoContext this object belongs to",
-							 G_PARAM_READABLE));
+							 G_PARAM_READABLE |
+							 G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_ORIGIN,
 		g_param_spec_enum("origin", "Origin",
 						  "The object's origin",
 						  GALAGO_TYPE_ORIGIN,
 						  GALAGO_LOCAL,
-						  G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+						  G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+						  G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_SUPPORTS_ATTRS,
 		g_param_spec_boolean("supports-attrs",
 							 "Support Remote Attributes",
 							 "Indicates if this object supports remote "
 							 "attributes",
-							 FALSE, G_PARAM_READABLE));
+							 FALSE, G_PARAM_READABLE |
+							 G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 }
 
 static void

Modified: trunk/libgalago/libgalago/galago-person.c
===================================================================
--- trunk/libgalago/libgalago/galago-person.c	2006-04-11 07:00:24 UTC (rev 2699)
+++ trunk/libgalago/libgalago/galago-person.c	2006-04-11 07:22:00 UTC (rev 2700)
@@ -145,19 +145,22 @@
 		g_param_spec_string("id", "ID",
 							"The person's unique ID",
 							NULL,
-							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_SESSION_ID,
 		g_param_spec_string("session-id", "Session ID",
 							"The person's session ID",
 							NULL,
-							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_PHOTO,
 		g_param_spec_object("photo", "Photo",
 							"The person's unique ID",
 							GALAGO_TYPE_IMAGE,
-							G_PARAM_READWRITE));
+							G_PARAM_READWRITE |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 }
 
 static void

Modified: trunk/libgalago/libgalago/galago-presence.c
===================================================================
--- trunk/libgalago/libgalago/galago-presence.c	2006-04-11 07:00:24 UTC (rev 2699)
+++ trunk/libgalago/libgalago/galago-presence.c	2006-04-11 07:22:00 UTC (rev 2700)
@@ -161,7 +161,8 @@
 		g_param_spec_object("account", "Account",
 							"The account that owns this presence",
 							GALAGO_TYPE_ACCOUNT,
-							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 }
 
 static void

Modified: trunk/libgalago/libgalago/galago-service.c
===================================================================
--- trunk/libgalago/libgalago/galago-service.c	2006-04-11 07:00:24 UTC (rev 2699)
+++ trunk/libgalago/libgalago/galago-service.c	2006-04-11 07:22:00 UTC (rev 2700)
@@ -125,19 +125,22 @@
 		g_param_spec_flags("flags", "Flags",
 						   "The service flags",
 						   GALAGO_TYPE_SERVICE_FLAGS, 0,
-						   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+						   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+						   G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_ID,
 		g_param_spec_string("id", "ID",
 						   "The service's unique ID",
 						   NULL,
-						   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+						   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+						   G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_NAME,
 		g_param_spec_string("name", "Name",
 						   "The service's name",
 						   NULL,
-						   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+						   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+						   G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 }
 
 static void

Modified: trunk/libgalago/libgalago/galago-status.c
===================================================================
--- trunk/libgalago/libgalago/galago-status.c	2006-04-11 07:00:24 UTC (rev 2699)
+++ trunk/libgalago/libgalago/galago-status.c	2006-04-11 07:22:00 UTC (rev 2700)
@@ -105,31 +105,36 @@
 						  "The primitive type this status is based on",
 						  GALAGO_TYPE_STATUS_TYPE,
 						  GALAGO_STATUS_UNSET,
-						  G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+						  G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+						  G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_PRESENCE,
 		g_param_spec_object("presence", "Presence",
 							"The presence object that this status belongs to",
 							GALAGO_TYPE_PRESENCE,
-							G_PARAM_READWRITE));
+							G_PARAM_READWRITE |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_ID,
 		g_param_spec_string("id", "ID",
 							"The status's ID",
 							NULL,
-							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_NAME,
 		g_param_spec_string("name", "Name",
 							"The status's descriptive name",
 							NULL,
-							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+							G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(gobject_class, PROP_EXCLUSIVE,
 		g_param_spec_boolean("exclusive", "Exclusive",
 							 "The status's exclusive state",
 							 FALSE,
-							 G_PARAM_READWRITE));
+							 G_PARAM_READWRITE |
+							 G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 }
 
 static void



More information about the galago-commits mailing list