[Galago-commits] r2362 - in trunk/galago-daemon: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2005-12-04 03:09:20 -0800 (Sun, 04 Dec 2005)
New Revision: 2362

Removed:
   trunk/galago-daemon/src/image.c
Modified:
   trunk/galago-daemon/ChangeLog
   trunk/galago-daemon/src/Makefile.am
   trunk/galago-daemon/src/filter.h
Log:
Remove support for Image object command handling, since there are no commands on an image.


Modified: trunk/galago-daemon/ChangeLog
===================================================================
--- trunk/galago-daemon/ChangeLog	2005-12-04 10:58:44 UTC (rev 2361)
+++ trunk/galago-daemon/ChangeLog	2005-12-04 11:09:20 UTC (rev 2362)
@@ -1,3 +1,11 @@
+Sun Dec 04 03:08:38 PST 2005  Christian Hammond <chipx86 at chipx86.com>
+
+	D src/image.c:
+	* src/filter.h:
+	* src/Makefile.am:
+	  - Remove support for Image object command handling, since there are
+	    no commands on an image.
+
 Sun Nov 27 15:43:25 PST 2005  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/core.c:

Modified: trunk/galago-daemon/src/Makefile.am
===================================================================
--- trunk/galago-daemon/src/Makefile.am	2005-12-04 10:58:44 UTC (rev 2361)
+++ trunk/galago-daemon/src/Makefile.am	2005-12-04 11:09:20 UTC (rev 2362)
@@ -13,7 +13,6 @@
 	filter.h \
 	galagod.c \
 	galagod.h \
-	image.c \
 	logging.c \
 	logging.h \
 	main.c \

Modified: trunk/galago-daemon/src/filter.h
===================================================================
--- trunk/galago-daemon/src/filter.h	2005-12-04 10:58:44 UTC (rev 2361)
+++ trunk/galago-daemon/src/filter.h	2005-12-04 11:09:20 UTC (rev 2362)
@@ -85,7 +85,4 @@
 void galagod_presence_add_filter(GalagoPresence *presence);
 void galagod_presence_remove_filter(GalagoPresence *presence);
 
-void galagod_image_add_filter(GalagoImage *image);
-void galagod_image_remove_filter(GalagoImage *image);
-
 #endif /* _GALAGOD_FILTER_H_ */

Deleted: trunk/galago-daemon/src/image.c
===================================================================
--- trunk/galago-daemon/src/image.c	2005-12-04 10:58:44 UTC (rev 2361)
+++ trunk/galago-daemon/src/image.c	2005-12-04 11:09:20 UTC (rev 2362)
@@ -1,57 +0,0 @@
-/**
- * @file image.c Galago Image message processor
- *
- * Copyright (C) 2004-2005 Christian Hammond.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- */
-#include "filter.h"
-
-static DBusHandlerResult
-image_set_data(DBusConnection *dbus_conn, DBusMessage *message,
-			   GalagodCoCo *coco, GalagoImage *image)
-{
-	DBusMessageIter iter, array_iter;
-	unsigned char *image_data;
-	int image_len;
-
-	dbus_message_iter_init(message, &iter);
-
-	dbus_message_iter_recurse(&iter, &array_iter);
-	dbus_message_iter_get_fixed_array(&array_iter, &image_data, &image_len);
-
-	galago_image_set_data(GALAGO_IMAGE(image), image_data, image_len);
-
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static const GalagodCommand commands[] =
-{
-	GALAGOD_COMMAND("SetData", image_set_data),
-	GALAGOD_COMMAND_LAST
-};
-
-void
-galagod_image_add_filter(GalagoImage *image)
-{
-	galagod_filters_add(image, commands, GALAGO_DBUS_IMAGE_INTERFACE);
-}
-
-void
-galagod_image_remove_filter(GalagoImage *image)
-{
-	galagod_filters_remove(image);
-}