[gnome-pilot/dbus] Add gpilot-daemon.[c|h] for D-Bus methods defined in gpilot-daemon.xml
- From: Halton Huo <haltonhuo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-pilot/dbus] Add gpilot-daemon.[c|h] for D-Bus methods defined in gpilot-daemon.xml
- Date: Mon, 1 Mar 2010 08:11:46 +0000 (UTC)
commit 24c7680c428a723a2d994e92b5fb5803d09327cc
Author: Halton Huo <halton huo sun com>
Date: Mon Mar 1 16:07:54 2010 +0800
Add gpilot-daemon.[c|h] for D-Bus methods defined in gpilot-daemon.xml
.gitignore | 2 +-
Makefile.am | 1 -
configure.ac | 9 -
gpilotd/.gpilot-daemon.h.swp | Bin 0 -> 20480 bytes
gpilotd/Makefile.am | 8 +-
gpilotd/gpilot-daemon.c | 264 +++++++++++++++++++++
gpilotd/gpilot-daemon.h | 190 +++++++++++++++
gpilotd/{gpilotd-daemon.xml => gpilot-daemon.xml} | 35 ++--
gpilotd/gpilotd.c | 2 +-
gpilotd/manager.c | 4 +-
gpilotd/queue_io.c | 4 +-
11 files changed, 485 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e29657..fbc2da7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,7 +57,7 @@ conduits/file/gpilot-install-file
conduits/file/palm.keys
conduits/test/test.conduit
gpilotd/org.gnome.GPilotd.service
-gpilotd/gpilotd-daemon-glue.h
+gpilotd/gpilot-daemon-glue.h
gpilotd/gnome-pilot-client-private.h
gpilotd/gnome-pilot-client.c
gpilotd/gnome-pilot-client.h
diff --git a/Makefile.am b/Makefile.am
index 9e49bcc..33cb49f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@ ACLOCAL_AMFLAGS=-I macros
SUBDIRS = \
po \
- idl \
gpilotd \
applet \
capplet \
diff --git a/configure.ac b/configure.ac
index fba689b..8004ab2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,7 +136,6 @@ dnl ******************************
LIBXML_REQUIRED="libxml-2.0"
LIBGNOME_REQUIRED="libgnome-2.0 >= 2.0.0"
LIBGTK_REQUIRED="gtk+-2.0 >= 2.13.0"
-ORBIT_REQUIRED="ORBit-2.0 >= 2.0.0"
LIBBONOBO_REQUIRED="libbonobo-2.0 >= 2.0.0"
LIBBONOBOUI_REQUIRED="libbonoboui-2.0 >= 2.0.0"
BONOBO_ACTIVATION_REQUIRED="bonobo-activation-2.0 >= 1.0.3"
@@ -151,7 +150,6 @@ PKG_CHECK_MODULES(GNOME_PILOT,
$LIBGTK_REQUIRED
$LIBBONOBO_REQUIRED
$LIBBONOBOUI_REQUIRED
- $ORBIT_REQUIRED
$DBUS_GLIB_REQUIRED
$BONOBO_ACTIVATION_REQUIRED
])
@@ -190,12 +188,6 @@ dnl ***********
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
AM_GCONF_SOURCE_2
-dnl ******************************
-dnl ORBit IDL Compiler
-dnl ******************************
-ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
-AC_SUBST(ORBIT_IDL)
-
dnl **************************************************
dnl * Marshaller generation
dnl **************************************************
@@ -258,7 +250,6 @@ conduits/file/Makefile
conduits/test/Makefile
capplet/Makefile
utils/Makefile
-idl/Makefile
po/Makefile.in
help/Makefile
help/C/Makefile
diff --git a/gpilotd/.gpilot-daemon.h.swp b/gpilotd/.gpilot-daemon.h.swp
new file mode 100644
index 0000000..d08e558
Binary files /dev/null and b/gpilotd/.gpilot-daemon.h.swp differ
diff --git a/gpilotd/Makefile.am b/gpilotd/Makefile.am
index e5edc64..868e048 100644
--- a/gpilotd/Makefile.am
+++ b/gpilotd/Makefile.am
@@ -101,13 +101,13 @@ gobfiles = \
# @for GF in $(gobfiles); do (echo -n "$(GOB) -w $$GF..." && $(GOB) -w $$GF && echo " ok"); done;
DBUS_SRCLIST = \
- gpilotd-daemon-glue.h \
+ gpilot-daemon-glue.h \
$(NULL)
BUILT_SOURCES = $(DBUS_SRCLIST) $(GOB_BUILT_SRCS) gpmarshal.c gpmarshal.h
-gpilotd-daemon-glue.h: gpilotd-daemon.xml Makefile.am
- dbus-binding-tool --prefix=gdm_daemon --mode=glib-server --output=gpilotd-daemon-glue.h $(srcdir)/gpilotd-daemon.xml
+gpilot-daemon-glue.h: gpilot-daemon.xml Makefile.am
+ dbus-binding-tool --prefix=gdm_daemon --mode=glib-server --output=gpilot-daemon-glue.h $(srcdir)/gpilot-daemon.xml
CLEANFILES = $(DBUS_SRCLIST) $(service_DATA)
MAINTAINERCLEANFILES = $(GOB_BUILT_SRCS)
@@ -199,6 +199,8 @@ gpilotd_SOURCES = \
manager.h \
queue_io.c \
queue_io.h \
+ gpilot-daemon.c \
+ gpilot-daemon.h \
$(NULL)
gpilotd_LDFLAGS = -export-dynamic
diff --git a/gpilotd/gpilot-daemon.c b/gpilotd/gpilot-daemon.c
new file mode 100644
index 0000000..94b152c
--- /dev/null
+++ b/gpilotd/gpilot-daemon.c
@@ -0,0 +1,264 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- *//*
+ *
+ * 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.
+ *
+ * Authors: Halton Huo <halton huo gmail com>
+ *
+ */
+
+#include "config.h"
+
+#include "gpilot-daemon.h"
+#include "gpilot-daemon-glue.h"
+
+static void gpilot_daemon_class_init (GpilotDaemonClass *klass);
+static void gpilot_daemon_init (GpilotDaemon *display);
+static void gpilot_daemon_finalize (GObject *object);
+
+G_DEFINE_ABSTRACT_TYPE (GpilotDaemon, gpilot_daemon, G_TYPE_OBJECT)
+
+struct GpilotDaemonPrivate
+{
+}
+
+gboolean
+gpilot_daemon_pause (gboolean on,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_reread_config (GError **error)
+{
+ return TRUE;
+}
+
+/* A no-operation call, used by client to occasionally
+ check to see if the daemon has blown up */
+gboolean
+gpilot_daemon_noop ()
+{
+ return TRUE;
+}
+
+/* request operations */
+gboolean
+gpilot_daemon_request_install (const char *pilot_id,
+ const char *file_name,
+ const char *description,
+ Survival survival,
+ unsigned long timeout,
+ unsigned long *handler,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_request_restore (const char *pilot_id,
+ const char *directory,
+ Survival survival,
+ unsigned long timeout,
+ unsigned long *handler,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_request_conduit (const char *pilot_id,
+ const char *conduit_name,
+ ConduitOperation operation,
+ Survival survival,
+ unsigned long timeout,
+ unsigned long *handler,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_remove_request (unsigned long *handler,
+ GError **error)
+{
+ return TRUE;
+}
+
+
+/* information operations */
+gboolean
+gpilot_daemon_get_system_info (const char *cradle,
+ Survival survival,
+ unsigned long timeout,
+ unsigned long *handler,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_get_users (GPtrArray **users,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_get_cradles (GPtrArray **cradles,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_get_pilots (GPtrArray **pilots,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_get_pilot_ids (GPtrArray **pilots,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_get_pilots_by_user_name (const char *username,
+ GPtrArray **pilots,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_get_pilots_by_user_login (const char *uid,
+ GPtrArray **pilots,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_get_user_name_by_pilot_name (const char *pilot_id,
+ char **username,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_get_user_login_by_pilot_name (const char *pilot_id,
+ char **uid,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_get_pilot_base_dir (const char *pilot_id,
+ char **base_dir,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_get_pilot_id_from_name (const char *pilot_name,
+ char **pilot_id,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_get_pilot_name_from_id (const char *pilot_id,
+ char **pilot_name,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_get_databases_from_cache (const char *pilot_id,
+ GPtrArray **databases,
+ GError **error)
+{
+ return TRUE;
+}
+
+/* admin operations */
+gboolean
+gpilot_daemon_get_user_info (const char *cradle,
+ Survival survival,
+ unsigned long timeout,
+ unsigned long *handler,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_set_user_info (const char *cradle,
+ gboolean continue_sync,
+ Survival survival,
+ unsigned long timeout,
+ unsigned long uid,
+ const char *username,
+ unsigned long *handler,
+ GError **error)
+{
+ return TRUE;
+}
+
+/* Notification operations */
+gboolean
+gpilot_daemon_monitor (const char *pilot_id,
+ gboolean on,
+ GError **error)
+{
+ return TRUE;
+}
+
+gboolean
+gpilot_daemon_event_nofify (EventType event_type,
+ gboolean on,
+ GError **error)
+{
+ return TRUE;
+}
+
+static void
+gpilot_daemon_class_init (GpilotDaemonClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->finalize = gdm_display_finalize;
+}
+
+static void
+gpilot_daemon_init (GpilotDaemon *daemon)
+{
+}
+
+static void
+gpilot_daemon_finalize (GObject *object)
+{
+ G_OBJECT_CLASS (gpilot_daemon_parent_class)->finalize (object);
+}
+
diff --git a/gpilotd/gpilot-daemon.h b/gpilotd/gpilot-daemon.h
new file mode 100644
index 0000000..ff22fb9
--- /dev/null
+++ b/gpilotd/gpilot-daemon.h
@@ -0,0 +1,190 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- *//*
+ *
+ * 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.
+ *
+ * Authors: Halton Huo <halton huo gmail com>
+ *
+ */
+
+#ifndef __GPILOT_DAEMON_H
+#define __GPILOT_DAEMON_H
+
+#include <glib-object.h>
+#include <dbus/dbus-glib.h>
+
+G_BEGIN_DECLS
+
+#define GPILOT_TYPE_DISPLAY (gpilotd_daemon_get_type ())
+#define GPILOT_DAEMON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GPILOT_TYPE_DISPLAY, GpilotDaemon))
+#define GPILOT_DAEMON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GPILOT_TYPE_DISPLAY, GpilotDaemonClass))
+#define GDM_IS_DISPLAY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GPILOT_TYPE_DISPLAY))
+#define GDM_IS_DISPLAY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GPILOT_TYPE_DISPLAY))
+#define GPILOT_DAEMON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GPILOT_TYPE_DISPLAY, GpilotDaemonClass))
+
+typedef enum
+{
+ IMMEDIATE,
+ PERSISTENT
+} Survival;
+
+typedef enum
+{
+ NOTIFY_CONNECT,
+ NOTIFY_DISCONNECT,
+ NOTIFY_BACKUP,
+ NOTIFY_CONDUIT,
+ NOTIFY_REQUEST_COMPLETION,
+ NOTIFY_REQUEST_TIMEOUT,
+ NOTIFY_USERINFO_REQUESTED,
+ NOTIFY_SYSINFO_REQUESTED,
+ NOTIFY_USERINFO_SENT
+} EventType;
+
+typedef enum
+{
+ SYNCHRONIZE,
+ CONDUIT_DEFAULT,
+ COPY_FROM_PILOT,
+ COPY_TO_PILOT,
+ MERGE_FROM_PILOT,
+ MERGE_TO_PILOT
+} ConduitOperation;
+
+typedef struct GpilotDaemonPrivate GpilotDaemonPrivate;
+typedef struct
+{
+ GObject parent;
+ GpilotDaemonPrivate *priv;
+} GpilotDaemon;
+
+typedef struct
+{
+ GObjectClass parent_class;
+ void (* connected) (GpilotDaemon *gpilot,
+ const char *pilot_id,
+ unsigned long *uid,
+ const char *user);
+} GpilotDaemonClass;
+
+GType gpilot_daemon_get_type (void);
+
+/* exported to bus */
+
+/* adm calls */
+gboolean gpilot_daemon_pause (gboolean on,
+ GError **error);
+gboolean gpilot_daemon_reread_config (GError **error);
+
+/* A no-operation call, used by client to occasionally
+ check to see if the daemon has blown up */
+gboolean gpilot_daemon_noop ();
+
+/* request operations */
+gboolean gpilot_daemon_request_install (const char *pilot_id,
+ const char *file_name,
+ const char *description,
+ Survival survival,
+ unsigned long timeout,
+ unsigned long *handler,
+ GError **error);
+gboolean gpilot_daemon_request_restore (const char *pilot_id,
+ const char *directory,
+ Survival survival,
+ unsigned long timeout,
+ unsigned long *handler,
+ GError **error);
+gboolean gpilot_daemon_request_conduit (const char *pilot_id,
+ const char *conduit_name,
+ ConduitOperation operation,
+ Survival survival,
+ unsigned long timeout,
+ unsigned long *handler,
+ GError **error);
+gboolean gpilot_daemon_remove_request (unsigned long *handler,
+ GError **error);
+
+/* information operations */
+gboolean gpilot_daemon_get_system_info (const char *cradle,
+ Survival survival,
+ unsigned long timeout,
+ unsigned long *handler,
+ GError **error);
+gboolean gpilot_daemon_get_users (GPtrArray **users,
+ GError **error);
+gboolean gpilot_daemon_get_cradles (GPtrArray **cradles,
+ GError **error);
+gboolean gpilot_daemon_get_pilots (GPtrArray **pilots,
+ GError **error);
+gboolean gpilot_daemon_get_pilot_ids (GPtrArray **pilots,
+ GError **error);
+gboolean gpilot_daemon_get_pilots_by_user_name
+ (const char *username,
+ GPtrArray **pilots,
+ GError **error);
+gboolean gpilot_daemon_get_pilots_by_user_login
+ (const char *uid,
+ GPtrArray **pilots,
+ GError **error);
+gboolean gpilot_daemon_get_user_name_by_pilot_name
+ (const char *pilot_id,
+ char **username,
+ GError **error);
+gboolean gpilot_daemon_get_user_login_by_pilot_name
+ (const char *pilot_id,
+ char **uid,
+ GError **error);
+gboolean gpilot_daemon_get_pilot_base_dir
+ (const char *pilot_id,
+ char **base_dir,
+ GError **error);
+gboolean gpilot_daemon_get_pilot_id_from_name
+ (const char *pilot_name,
+ char **pilot_id,
+ GError **error);
+gboolean gpilot_daemon_get_pilot_name_from_id
+ (const char *pilot_id,
+ char **pilot_name,
+ GError **error);
+gboolean gpilot_daemon_get_databases_from_cache
+ (const char *pilot_id,
+ GPtrArray **databases,
+ GError **error);
+/* admin operations */
+gboolean gpilot_daemon_get_user_info (const char *cradle,
+ Survival survival,
+ unsigned long timeout,
+ unsigned long *handler,
+ GError **error);
+gboolean gpilot_daemon_set_user_info (const char *cradle,
+ gboolean continue_sync,
+ Survival survival,
+ unsigned long timeout,
+ unsigned long uid,
+ const char *username,
+ unsigned long *handler,
+ GError **error);
+/* Notification operations */
+gboolean gpilot_daemon_monitor (const char *pilot_id,
+ gboolean on,
+ GError **error);
+gboolean gpilot_daemon_event_nofify (EventType event_type,
+ gboolean on,
+ GError **error);
+
+
+G_END_DECLS
+
+#endif /* __GPILOT_DAEMON_H */
diff --git a/gpilotd/gpilotd-daemon.xml b/gpilotd/gpilot-daemon.xml
similarity index 96%
rename from gpilotd/gpilotd-daemon.xml
rename to gpilotd/gpilot-daemon.xml
index 62aeb04..40ada13 100644
--- a/gpilotd/gpilotd-daemon.xml
+++ b/gpilotd/gpilot-daemon.xml
@@ -2,7 +2,7 @@
<node>
<interface name="org.gnome.GnomePilot.Daemon">
<method name="Pause">
- <arg name="on_off" direction="in" type="b"/>
+ <arg name="on" direction="in" type="b"/>
<doc:doc>
<doc:description>
<doc:para>This method initiates a request to pause or continue the daemon.</doc:para>
@@ -52,7 +52,7 @@
<doc:summary>The time out by second.</doc:summary>
</doc:doc>
</arg>
- <arg name="handle" direction="out" type="u">
+ <arg name="handler" direction="out" type="u">
<doc:doc>
<doc:summary>The returned handler.</doc:summary>
</doc:doc>
@@ -85,7 +85,7 @@
<doc:summary>The time out by second.</doc:summary>
</doc:doc>
</arg>
- <arg name="handle" direction="out" type="u">
+ <arg name="handler" direction="out" type="u">
<doc:doc>
<doc:summary>The returned handler.</doc:summary>
</doc:doc>
@@ -130,7 +130,7 @@
<doc:summary>The time out by second.</doc:summary>
</doc:doc>
</arg>
- <arg name="handle" direction="out" type="u">
+ <arg name="handler" direction="out" type="u">
<doc:doc>
<doc:summary>The returned handler.</doc:summary>
</doc:doc>
@@ -143,7 +143,7 @@
</method>
<method name="RemoveRequest">
- <arg name="handle" direction="in" type="u">
+ <arg name="handler" direction="in" type="u">
<doc:doc>
<doc:summary>The handler.</doc:summary>
</doc:doc>
@@ -166,7 +166,12 @@
<doc:summary>Indicate how this operation survive. Currently 0 means immediate, 1 means persitent.</doc:summary>
</doc:doc>
</arg>
- <arg name="handle" direction="out" type="u">
+ <arg name="timeout" direction="in" type="u">
+ <doc:doc>
+ <doc:summary>The time out by second.</doc:summary>
+ </doc:doc>
+ </arg>
+ <arg name="handler" direction="out" type="u">
<doc:doc>
<doc:summary>The returned handler.</doc:summary>
</doc:doc>
@@ -181,7 +186,7 @@
<method name="GetUsers">
<arg name="users" direction="out" type="as">
<doc:doc>
- <doc:summary>An array of users.</doc:summary>
+ <doc:summary>An array of user names.</doc:summary>
</doc:doc>
</arg>
<doc:doc>
@@ -231,7 +236,7 @@
</method>
<method name="GetPilotsByUserName">
- <arg name="user" direction="in" type="s">
+ <arg name="username" direction="in" type="s">
<doc:doc>
<doc:summary>The user name.</doc:summary>
</doc:doc>
@@ -272,7 +277,7 @@
<doc:summary>The pilot name.</doc:summary>
</doc:doc>
</arg>
- <arg name="user" direction="out" type="s">
+ <arg name="username" direction="out" type="s">
<doc:doc>
<doc:summary>The returned user name.</doc:summary>
</doc:doc>
@@ -303,7 +308,7 @@
</method>
<method name="GetPilotBaseDir">
- <arg name="pilot_name" direction="in" type="s">
+ <arg name="pilot_id" direction="in" type="s">
<doc:doc>
<doc:summary>The pilot name.</doc:summary>
</doc:doc>
@@ -390,7 +395,7 @@
<doc:summary>The time out by second.</doc:summary>
</doc:doc>
</arg>
- <arg name="handle" direction="out" type="u">
+ <arg name="handler" direction="out" type="u">
<doc:doc>
<doc:summary>The returned handler.</doc:summary>
</doc:doc>
@@ -428,12 +433,12 @@
<doc:summary>The returned user id.</doc:summary>
</doc:doc>
</arg>
- <arg name="user" direction="out" type="s">
+ <arg name="username" direction="out" type="s">
<doc:doc>
<doc:summary>The returned user name.</doc:summary>
</doc:doc>
</arg>
- <arg name="handle" direction="out" type="u">
+ <arg name="handler" direction="out" type="u">
<doc:doc>
<doc:summary>The returned handler.</doc:summary>
</doc:doc>
@@ -502,7 +507,7 @@
<doc:summary>The user id.</doc:summary>
</doc:doc>
</arg>
- <arg name="user" type="s">
+ <arg name="username" type="s">
<doc:doc>
<doc:summary>The user name.</doc:summary>
</doc:doc>
@@ -556,7 +561,7 @@
<doc:summary>The user id.</doc:summary>
</doc:doc>
</arg>
- <arg name="user" type="s">
+ <arg name="username" type="s">
<doc:doc>
<doc:summary>The user name.</doc:summary>
</doc:doc>
diff --git a/gpilotd/gpilotd.c b/gpilotd/gpilotd.c
index 68a1bb6..efbe90f 100644
--- a/gpilotd/gpilotd.c
+++ b/gpilotd/gpilotd.c
@@ -73,7 +73,7 @@
#include "manager.h"
#include "gnome-pilot-structures.h"
-#include "orbit_daemon_glue.h"
+#include "gpilot-daemon.h"
#include "gpilot-gui.h"
#include "gnome-pilot-conduit-backup.h"
#include "gnome-pilot-config.h"
diff --git a/gpilotd/manager.c b/gpilotd/manager.c
index 00a9997..b0297c4 100644
--- a/gpilotd/manager.c
+++ b/gpilotd/manager.c
@@ -35,7 +35,7 @@
#include <glib/gi18n.h>
-#include "orbit_daemon_glue.h"
+#include "gpilot-daemon.h"
#include "manager.h"
#include "queue_io.h"
#include "gnome-pilot-conduit-backup.h"
@@ -163,7 +163,7 @@ find_matching_conduit_name (GList *conlist, gchar *name)
/**************************************************************************/
/* Here comes conduit signal handler, used to call methods from
- orbit_daemon_glue */
+ gpilot-daemon */
typedef struct {
GnomePilotInstallCarrier *carrier;
diff --git a/gpilotd/queue_io.c b/gpilotd/queue_io.c
index 1a06ae7..fdb9531 100644
--- a/gpilotd/queue_io.c
+++ b/gpilotd/queue_io.c
@@ -23,7 +23,7 @@
#include <glib/gi18n.h>
#include "queue_io.h"
#include "gnome-pilot-config.h"
-#include "orbit_daemon_glue.h"
+#include "gpilot-daemon.h"
#define NUMREQ "number-of-requests"
@@ -261,7 +261,7 @@ gpc_queue_load_request (guint32 pilot_id, gboolean _type, guint num)
/*
FIXME: Leaks! gpc_queue_store_requests is called from
- orbit_daemon_glue in a return call, with strings that are strdupped,
+ gpilot_daemon in a return call, with strings that are strdupped,
thus they're leaked.
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
