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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-06 01:57:54 -0700 (Thu, 06 Apr 2006)
New Revision: 2681

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-core.c
   trunk/libgalago/libgalago/galago-person.c
Log:
Due to a bug or something in the C# bindings, the priority account calcuation is not working. The default handler is always being called and is the only one ever being called, instead of being called last if nothing else provided a returned account. Now we just unset this and then check if the result is NULL. If so, we specifically call our default handler function.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-04-05 09:42:14 UTC (rev 2680)
+++ trunk/libgalago/ChangeLog	2006-04-06 08:57:54 UTC (rev 2681)
@@ -1,3 +1,14 @@
+Thu Apr 06 01:56:38 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-core.c:
+	* libgalago/galago-person.c:
+	  - Due to a bug or something in the C# bindings, the priority account
+	    calcuation is not working. The default handler is always being called
+	    and is the only one ever being called, instead of being called last if
+	    nothing else provided a returned account. Now we just unset this and
+	    then check if the result is NULL. If so, we specifically call our
+	    default handler function.
+
 Wed Apr 05 02:27:49 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-core.c:

Modified: trunk/libgalago/libgalago/galago-core.c
===================================================================
--- trunk/libgalago/libgalago/galago-core.c	2006-04-05 09:42:14 UTC (rev 2680)
+++ trunk/libgalago/libgalago/galago-core.c	2006-04-06 08:57:54 UTC (rev 2681)
@@ -83,8 +83,8 @@
 #define GALAGO_DAEMON_ID "#galago-daemon#"
 
 /* galago-person.c */
-GalagoAccount *_galago_person_real_calc_priority_account(GalagoCore *unused,
-														 GalagoPerson *person);
+GalagoAccount *_galago_person_default_calc_priority_account(
+	const GalagoPerson *person);
 
 static void _galago_core_disconnect(void);
 static gboolean _galago_dbus_register_connection(void);
@@ -150,7 +150,7 @@
 	object_class->dbus_interface = GALAGO_DBUS_CORE_INTERFACE;
 	object_class->destroy = galago_core_destroy;
 
-	klass->calc_priority_account = _galago_person_real_calc_priority_account;
+	klass->calc_priority_account = NULL;
 
 	signals[REGISTERED] =
 		g_signal_new("registered",
@@ -810,7 +810,12 @@
 _galago_core_calc_priority_account(const GalagoPerson *person)
 {
 	GalagoAccount *account = NULL;
+
 	g_signal_emit(_core, signals[CALC_PRIORITY_ACCOUNT], 0, person, &account);
+
+	if (account == NULL)
+		account = _galago_person_default_calc_priority_account(person);
+
 	return account;
 }
 

Modified: trunk/libgalago/libgalago/galago-person.c
===================================================================
--- trunk/libgalago/libgalago/galago-person.c	2006-04-05 09:42:14 UTC (rev 2680)
+++ trunk/libgalago/libgalago/galago-person.c	2006-04-06 08:57:54 UTC (rev 2681)
@@ -602,8 +602,7 @@
 }
 
 GalagoAccount *
-_galago_person_real_calc_priority_account(GObject *unused,
-										  GalagoPerson *person)
+_galago_person_default_calc_priority_account(const GalagoPerson *person)
 {
 	GList *l, *accounts;
 	GalagoPresence *priority_presence = NULL;