[gnome-pilot/gtk3: 1/6] Port to gtk3. Found many GtkObject references, and recently deprecated methods.
- From: Matthew Charles Davey <mcdavey src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-pilot/gtk3: 1/6] Port to gtk3. Found many GtkObject references, and recently deprecated methods.
- Date: Sun, 13 Mar 2011 18:31:42 +0000 (UTC)
commit ed78a0915ad4691cc49d3abdf3e2812212c99ccc
Author: Matt Davey <mcdavey mrao cam ac uk>
Date: Sat Jan 29 18:14:38 2011 +0000
Port to gtk3. Found many GtkObject references, and recently deprecated methods.
011-01-29 Matt Davey <mcdavey mrao cam ac uk>
* gtk3 branch.
* configure.ac: bump libraries to v3. Update all dependencies.
Require pilot-link 0.12, remove hal option, require gudev,
* gnome-pilot-3.0.pc.in: renamed from gnome-pilot-2.0.pc.in
* Makefile.am: reference gnome-pilot-3.0.pc
* various: remove PILOT_LINK_0_12 #defines. Ancient history
* various: remove references to GtkObject and friends.
* libgpilotdCM: get rid of this directory, put stuff in gpilotd/
* include files: reorganise installed includes into
"gnome-pilot-3.0" rather than include/gpilotd/. Remove all
relative directory includes (<gpilotd/...h>). Add appropriate
include flags to gnome-pilot-3.0.pc.in, instead.
* Note: at present, the applet is broken, as it needs to be
ported to libpanelapplet-3.
.gitignore | 12 +-
ChangeLog | 17 ++
Makefile.am | 5 +-
applet/gpilot-applet-progress.gob | 6 +-
applet/pilot.c | 4 +-
capplet/gnome-pilot-assistant.c | 108 ++++-----
capplet/gnome-pilot-assistant.h | 8 +-
capplet/gnome-pilot-capplet.c | 48 ++--
capplet/gnome-pilot-capplet.h | 2 +-
capplet/gnome-pilot-cdialog.c | 26 +--
capplet/gnome-pilot-cdialog.h | 6 +-
capplet/gnome-pilot-ddialog.c | 44 ++--
capplet/gnome-pilot-ddialog.h | 6 +-
capplet/gnome-pilot-pdialog.c | 66 ++----
capplet/gnome-pilot-pdialog.h | 8 +-
capplet/gpilotd-control-applet.c | 6 +-
capplet/pilot.c | 17 +--
capplet/pilot.h | 10 +-
capplet/util.c | 34 +---
capplet/util.h | 6 +-
conduits/backup/backup_conduit.c | 102 +--------
conduits/evolution-data-server/address-conduit.c | 67 +-----
conduits/evolution-data-server/calendar-conduit.c | 66 +-----
conduits/evolution-data-server/e-pilot-util.c | 8 -
conduits/evolution-data-server/memo-conduit.c | 65 +-----
conduits/evolution-data-server/todo-conduit.c | 63 +-----
conduits/file/file_conduit.c | 2 +-
conduits/file/gpilot_install_file.c | 4 +-
conduits/test/test_conduit.c | 8 +-
configure.ac | 86 +++-----
gnome-pilot-2.0.pc.in => gnome-pilot-3.0.pc.in | 5 +-
gpilotd/Makefile.am | 35 +--
gpilotd/gnome-pilot-client.gob | 14 +-
gpilotd/gnome-pilot-conduit-backup.gob | 4 +-
gpilotd/gnome-pilot-conduit-config.gob | 15 +-
gpilotd/gnome-pilot-conduit-file.gob | 4 +-
gpilotd/gnome-pilot-conduit-management.gob | 11 +-
gpilotd/gnome-pilot-conduit-standard-abs.c | 62 ++----
gpilotd/gnome-pilot-conduit-standard-abs.h | 2 +-
gpilotd/gnome-pilot-conduit-standard.gob | 4 +-
gpilotd/gnome-pilot-conduit-sync-abs.c | 36 ++--
gpilotd/gnome-pilot-conduit-sync-abs.h | 2 +-
gpilotd/gnome-pilot-conduit.gob | 6 +-
gpilotd/gnome-pilot-structures.c | 19 +--
gpilotd/gpilot-daemon.c | 241 +-------------------
.../OChangeLog => gpilotd/libgpilotdCM-OChangeLog | 3 +
gpilotd/manager.c | 18 +-
libgpilotdCM/.cvsignore | 15 --
utils/gpilotd-client.c | 2 +-
utils/gpilotdcm-client.c | 4 +-
utils/make-password.c | 9 -
51 files changed, 360 insertions(+), 1061 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eb348cc..46ff61d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,12 +93,12 @@ help/de/de.mo
help/de/gnome-pilot.xml
help/es/es.mo
help/es/gnome-pilot.xml
-libgpilotdCM/gnome-pilot-conduit-config-private.h
-libgpilotdCM/gnome-pilot-conduit-config.c
-libgpilotdCM/gnome-pilot-conduit-config.h
-libgpilotdCM/gnome-pilot-conduit-management-private.h
-libgpilotdCM/gnome-pilot-conduit-management.c
-libgpilotdCM/gnome-pilot-conduit-management.h
+gpilotd/gnome-pilot-conduit-config-private.h
+gpilotd/gnome-pilot-conduit-config.c
+gpilotd/gnome-pilot-conduit-config.h
+gpilotd/gnome-pilot-conduit-management-private.h
+gpilotd/gnome-pilot-conduit-management.c
+gpilotd/gnome-pilot-conduit-management.h
po/stamp-it
utils/gnome-pilot-make-password
utils/gpilotd-client
diff --git a/ChangeLog b/ChangeLog
index 2052f08..f48aa50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-29 Matt Davey <mcdavey mrao cam ac uk>
+ * gtk3 branch.
+ * configure.ac: bump libraries to v3. Update all dependencies.
+ Require pilot-link 0.12, remove hal option, require gudev,
+ * gnome-pilot-3.0.pc.in: renamed from gnome-pilot-2.0.pc.in
+ * Makefile.am: reference gnome-pilot-3.0.pc
+ * various: remove PILOT_LINK_0_12 #defines. Ancient history
+ * various: remove references to GtkObject and friends.
+ * libgpilotdCM: get rid of this directory, put stuff in gpilotd/
+ * include files: reorganise installed includes into
+ "gnome-pilot-3.0" rather than include/gpilotd/. Remove all
+ relative directory includes (<gpilotd/...h>). Add appropriate
+ include flags to gnome-pilot-3.0.pc.in, instead.
+ * Note: at present, the applet is broken, as it needs to be
+ ported to libpanelapplet-3.
+
+
2011-01-03 Matt Davey <mcdavey mrao cam ac uk>
* applet/Makefile.am: fix gob rules to support
parallel builds. Thanks Matt McCutchen. #634874
diff --git a/Makefile.am b/Makefile.am
index 57e0205..ea33fec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ SUBDIRS = \
help
pkglibdir=$(libdir)/pkgconfig
-pkglib_DATA=gnome-pilot-2.0.pc
+pkglib_DATA=gnome-pilot-3.0.pc
# ignore the scrollkeeper files on uninstall check
distuninstallcheck_listfiles = find . -type f -print | grep -v \
@@ -23,7 +23,6 @@ changelogs = \
conduits/OChangeLog \
conduits/file/OChangeLog \
gpilotd/OChangeLog \
- libgpilotdCM/OChangeLog \
utils/OChangeLog
EXTRA_DIST= \
@@ -35,7 +34,7 @@ EXTRA_DIST= \
intltool-extract.in \
intltool-update.in \
intltool-merge.in \
- gnome-pilot-2.0.pc.in
+ gnome-pilot-3.0.pc.in
DISTCLEANFILES = \
gnome-doc-utils.make \
diff --git a/applet/gpilot-applet-progress.gob b/applet/gpilot-applet-progress.gob
index 9b6b482..7af5deb 100644
--- a/applet/gpilot-applet-progress.gob
+++ b/applet/gpilot-applet-progress.gob
@@ -14,7 +14,7 @@ static gboolean timeout (GPilotAppletProgress *obj);
%}
-class GPilot:Applet:Progress from Gtk:Object {
+class GPilot:Applet:Progress from G:Object {
public GtkProgressBar *progress;
argument POINTER (type GtkProgressBar*) progress (export) link;
public gboolean alive;
@@ -28,9 +28,9 @@ class GPilot:Applet:Progress from Gtk:Object {
self->progress = NULL;
}
- public GtkObject*
+ public GObject*
new (void) {
- return (GtkObject*)GET_NEW;
+ return (GObject*)GET_NEW;
}
public void
diff --git a/applet/pilot.c b/applet/pilot.c
index 0053bbd..c83e4bd 100644
--- a/applet/pilot.c
+++ b/applet/pilot.c
@@ -32,9 +32,9 @@
#include <signal.h>
-#include "gpilotd/gpilot-daemon.h"
+#include "gpilot-daemon.h"
#include "gpilot-applet-progress.h"
-#include "gpilotd/gnome-pilot-client.h"
+#include "gnome-pilot-client.h"
enum {
TARGET_URI_LIST,
diff --git a/capplet/gnome-pilot-assistant.c b/capplet/gnome-pilot-assistant.c
index 87cbe87..e57466b 100644
--- a/capplet/gnome-pilot-assistant.c
+++ b/capplet/gnome-pilot-assistant.c
@@ -43,7 +43,7 @@
#define GPD_PAGE_PILOT_TWO 5
#define GPD_PAGE_FINISH 6
-static GtkObjectClass *parent_class = NULL;
+static GObjectClass *parent_class = NULL;
struct _GnomePilotAssistantPrivate
{
@@ -93,9 +93,7 @@ struct _GnomePilotAssistantPrivate
GtkWidget *pilot_name;
GtkWidget *pilot_basedir;
-#ifdef PILOT_LINK_0_12
GtkWidget *pilot_charset;
-#endif
GtkWidget *pilot_charset_label;
GtkWidget *pilot_charset_combo;
};
@@ -134,7 +132,7 @@ static void gpd_userinfo_requested (GnomePilotClient *gpc, const gchar *device,
static void gpd_system_info_requested (GnomePilotClient *gpc,
const gchar *device, const GNOME_Pilot_SysInfo *sysinfo, gpointer user_data);
-static void gpd_destroy (GtkObject *object);
+static void gpd_dispose (GObject *object);
GType
gnome_pilot_assistant_get_type (void)
@@ -156,7 +154,7 @@ gnome_pilot_assistant_get_type (void)
(GInstanceInitFunc) init,
};
- type = g_type_register_static (gtk_object_get_type (), "GnomePilotAssistant", &info, 0);
+ type = g_type_register_static (g_object_get_type (), "GnomePilotAssistant", &info, 0);
}
return type;
@@ -165,13 +163,13 @@ gnome_pilot_assistant_get_type (void)
static void
class_init (GnomePilotAssistantClass *klass)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
- object_class = GTK_OBJECT_CLASS (klass);
+ object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek (gtk_object_get_type ());
+ parent_class = g_type_class_peek (g_object_get_type ());
- object_class->destroy = gpd_destroy;
+ object_class->dispose = gpd_dispose;
}
static void
@@ -225,22 +223,22 @@ init (GnomePilotAssistant *gpd)
-GtkObject *
+GObject *
gnome_pilot_assistant_new (GnomePilotClient *gpc)
{
GnomePilotAssistant *gpd;
- GtkObject *obj;
+ GObject *obj;
- obj = GTK_OBJECT(g_type_create_instance (GNOME_PILOT_TYPE_ASSISTANT));
+ obj = G_OBJECT(g_type_create_instance (GNOME_PILOT_TYPE_ASSISTANT));
gpd = GNOME_PILOT_ASSISTANT (obj);
gpd->priv->gpc = gpc;
- g_signal_connect (GTK_OBJECT (gpc), "completed_request",
+ g_signal_connect (G_OBJECT (gpc), "completed_request",
G_CALLBACK (gpd_request_completed), gpd);
- g_signal_connect (GTK_OBJECT (gpc), "user_info",
+ g_signal_connect (G_OBJECT (gpc), "user_info",
G_CALLBACK (gpd_userinfo_requested), gpd);
- g_signal_connect (GTK_OBJECT (gpc), "system_info",
+ g_signal_connect (G_OBJECT (gpc), "system_info",
G_CALLBACK (gpd_system_info_requested), gpd);
return obj;
@@ -302,21 +300,19 @@ get_widgets (GnomePilotAssistant *gpd)
model = GTK_TREE_MODEL(gtk_builder_get_object (priv->ui,
"assistant_device_port_store"));
gtk_combo_box_set_model (GTK_COMBO_BOX (priv->device_port_combo), model);
- gtk_combo_box_entry_set_text_column(
- GTK_COMBO_BOX_ENTRY (priv->device_port_combo), 0);
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (
+ priv->device_port_combo), 0);
gtk_cell_layout_clear(GTK_CELL_LAYOUT(priv->device_port_combo));
GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (priv->device_port_combo),
renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (priv->device_port_combo),
renderer, "text", 0);
-#ifdef PILOT_LINK_0_12
/* usb: (libusb) pseudo-device is available from pilot-link 0.12.0 */
gtk_list_store_prepend (GTK_LIST_STORE (model), &iter);
gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, "usb:", -1);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->device_usb), 1);
-#endif
gtk_combo_box_set_active(
GTK_COMBO_BOX (priv->device_port_combo), 0);
@@ -334,10 +330,8 @@ get_widgets (GnomePilotAssistant *gpd)
priv->pilot_basedir = GW ("assistant_pilot_basedir_entry");
priv->pilot_charset_label = GW ("assistant_pilot_charset_label");
priv->pilot_charset_combo = GW ("assistant_pilot_charset_combo");
-#ifdef PILOT_LINK_0_12
priv->pilot_charset = gtk_bin_get_child (
GTK_BIN(priv->pilot_charset_combo));
-#endif
#undef GW
@@ -359,9 +353,7 @@ get_widgets (GnomePilotAssistant *gpd)
&& priv->sync_label
&& priv->pilot_name
&& priv->pilot_basedir
-#ifdef PILOT_LINK_0_12
&& priv->pilot_charset
-#endif
&& priv->pilot_charset_label
&& priv->pilot_charset_combo);
}
@@ -386,9 +378,7 @@ map_widgets (GnomePilotAssistant *gpd)
g_object_set_data (G_OBJECT (gpd), "pilotid", priv->pilot_id);
g_object_set_data (G_OBJECT (gpd), "pilotname", priv->pilot_name);
g_object_set_data (G_OBJECT (gpd), "basedir", priv->pilot_basedir);
-#ifdef PILOT_LINK_0_12
g_object_set_data (G_OBJECT (gpd), "charset", priv->pilot_charset);
-#endif
}
static void
@@ -399,12 +389,12 @@ init_widgets (GnomePilotAssistant *gpd)
priv = gpd->priv;
/* Main signals */
- g_signal_connect (GTK_OBJECT (priv->assistant), "delete_event",
+ g_signal_connect (G_OBJECT (priv->assistant), "delete_event",
G_CALLBACK (gpd_delete_window), gpd);
- g_signal_connect (GTK_OBJECT (priv->assistant), "cancel",
+ g_signal_connect (G_OBJECT (priv->assistant), "cancel",
G_CALLBACK (gpd_canceled), gpd);
- // g_signal_connect (GTK_OBJECT (priv->assistant), "help",
+ // g_signal_connect (G_OBJECT (priv->assistant), "help",
// G_CALLBACK (gpd_help), gpd);
@@ -416,28 +406,28 @@ init_widgets (GnomePilotAssistant *gpd)
/* Other widget signals */
- g_signal_connect (GTK_OBJECT (priv->device_name),"changed",
+ g_signal_connect (G_OBJECT (priv->device_name),"changed",
G_CALLBACK (gpd_device_info_check), gpd);
- g_signal_connect (GTK_OBJECT (priv->device_port),"insert-text",
+ g_signal_connect (G_OBJECT (priv->device_port),"insert-text",
G_CALLBACK (insert_device_callback), NULL);
- g_signal_connect (GTK_OBJECT (priv->device_network), "toggled",
+ g_signal_connect (G_OBJECT (priv->device_network), "toggled",
G_CALLBACK (network_device_toggled_callback), gpd);
- g_signal_connect (GTK_OBJECT (priv->device_bluetooth), "toggled",
+ g_signal_connect (G_OBJECT (priv->device_bluetooth), "toggled",
G_CALLBACK (network_device_toggled_callback), gpd);
- g_signal_connect (GTK_OBJECT (priv->device_port),"changed",
+ g_signal_connect (G_OBJECT (priv->device_port),"changed",
G_CALLBACK (gpd_device_info_check), gpd);
- g_signal_connect (GTK_OBJECT (priv->pilot_info_no),"toggled",
+ g_signal_connect (G_OBJECT (priv->pilot_info_no),"toggled",
G_CALLBACK (gpd_pilot_info_button), gpd);
- g_signal_connect (GTK_OBJECT (priv->pilot_username),"insert-text",
+ g_signal_connect (G_OBJECT (priv->pilot_username),"insert-text",
G_CALLBACK (insert_username_callback), NULL);
- g_signal_connect (GTK_OBJECT (priv->pilot_username),"changed",
+ g_signal_connect (G_OBJECT (priv->pilot_username),"changed",
G_CALLBACK (gpd_pilot_info_check), gpd);
- g_signal_connect (GTK_OBJECT (priv->pilot_id),"insert-text",
+ g_signal_connect (G_OBJECT (priv->pilot_id),"insert-text",
G_CALLBACK (insert_numeric_callback), NULL);
- g_signal_connect (GTK_OBJECT (priv->pilot_id),"changed",
+ g_signal_connect (G_OBJECT (priv->pilot_id),"changed",
G_CALLBACK (gpd_pilot_info_check), gpd);
- g_signal_connect (GTK_OBJECT (priv->pilot_name),"changed",
+ g_signal_connect (G_OBJECT (priv->pilot_name),"changed",
G_CALLBACK (gpd_pilot_name_check), gpd);
}
@@ -456,8 +446,8 @@ fill_widgets (GnomePilotAssistant *gpd)
gtk_entry_set_text (GTK_ENTRY (priv->device_name), str);
g_free (str);
set_widget_visibility_by_type(gpd,
- (GTK_TOGGLE_BUTTON(priv->device_network)->active ||
- GTK_TOGGLE_BUTTON(priv->device_bluetooth)->active) ?
+ (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->device_network)) ||
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->device_bluetooth))) ?
PILOT_DEVICE_NETWORK : PILOT_DEVICE_SERIAL);
/* First pilot page */
@@ -472,13 +462,8 @@ fill_widgets (GnomePilotAssistant *gpd)
str2 = g_build_filename (g_get_home_dir (), str, NULL);
gtk_entry_set_text (GTK_ENTRY (priv->pilot_basedir), str2);
-#ifndef PILOT_LINK_0_12
- gtk_widget_set_sensitive(priv->pilot_charset_label, FALSE);
- gtk_widget_set_sensitive(priv->pilot_charset_combo, FALSE);
-#else
gtk_entry_set_text (GTK_ENTRY (priv->pilot_charset),
get_default_pilot_charset());
-#endif
g_free (str);
g_free (str2);
@@ -498,7 +483,7 @@ gnome_pilot_assistant_run_and_close (GnomePilotAssistant *gpd)
result = priv->finished;
- gtk_object_destroy (GTK_OBJECT (gpd));
+ g_object_unref (G_OBJECT (gpd));
return result;
}
@@ -610,7 +595,7 @@ gpd_page_prepare (GtkAssistant *assistant, GtkWidget *page,
gpd->priv->page_pilot_two, TRUE);
break;
case GPD_PAGE_FINISH:
- g_signal_connect (GTK_OBJECT (gpd->priv->assistant), "close",
+ g_signal_connect (G_OBJECT (gpd->priv->assistant), "close",
G_CALLBACK (gpd_finish_page_finished), gpd);
default:
@@ -692,7 +677,7 @@ gpd_cradle_page_next (GnomePilotAssistant *gpd)
/* check the device settings */
tmp_device = gpilot_device_new();
- read_device_config(GTK_OBJECT(gpd), tmp_device);
+ read_device_config(G_OBJECT(gpd), tmp_device);
if (priv->errstr != NULL) {
g_free(priv->errstr);
priv->errstr = NULL;
@@ -724,14 +709,14 @@ gpd_sync_page_prepare (GnomePilotAssistant *gpd)
priv = gpd->priv;
- read_device_config (GTK_OBJECT (gpd), priv->device);
+ read_device_config (G_OBJECT (gpd), priv->device);
if (priv->state->devices == NULL)
priv->state->devices = g_list_append (priv->state->devices, priv->device);
- if (GTK_TOGGLE_BUTTON (priv->pilot_info_no)->active) {
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (priv->pilot_info_no))) {
/* do send_to_pilot */
- read_pilot_config (GTK_OBJECT (gpd), priv->pilot);
+ read_pilot_config (G_OBJECT (gpd), priv->pilot);
location = priv->device->type == PILOT_DEVICE_NETWORK ?
"netsync" : (priv->device->type == PILOT_DEVICE_BLUETOOTH ?
"bluetooth" : priv->device->port);
@@ -824,9 +809,7 @@ gpd_pilot_page_two_next (GnomePilotAssistant *gpd)
priv->errstr = NULL;
}
return (!(check_base_directory (gtk_entry_get_text (GTK_ENTRY (priv->pilot_basedir)), &priv->errstr)
-#ifdef PILOT_LINK_0_12
&& check_pilot_charset (gtk_entry_get_text (GTK_ENTRY (priv->pilot_charset)), &priv->errstr)
-#endif
));
}
@@ -838,7 +821,7 @@ gpd_finish_page_finished (GtkAssistant *assistant, gpointer data)
priv = gpd->priv;
- read_pilot_config (GTK_OBJECT (gpd), priv->pilot);
+ read_pilot_config (G_OBJECT (gpd), priv->pilot);
priv->state->pilots = g_list_append (priv->state->pilots, priv->pilot);
save_config_and_restart (priv->gpc, priv->state);
@@ -871,7 +854,7 @@ gpd_pilot_info_check (GtkEditable *editable, gpointer user_data)
priv = gpd->priv;
- if (GTK_TOGGLE_BUTTON (priv->pilot_info_no)->active)
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (priv->pilot_info_no)))
ready = check_pilot_settings (gpd);
gtk_assistant_set_page_complete (GTK_ASSISTANT (priv->assistant),
@@ -901,8 +884,8 @@ gpd_pilot_info_button (GtkToggleButton *toggle, gpointer user_data)
priv = gpd->priv;
- gtk_widget_set_sensitive (priv->pilot_info, toggle->active);
- if (toggle->active)
+ gtk_widget_set_sensitive (priv->pilot_info, gtk_toggle_button_get_active(toggle));
+ if (gtk_toggle_button_get_active(toggle))
ready = check_pilot_settings (gpd);
gtk_assistant_set_page_complete (GTK_ASSISTANT (priv->assistant),
@@ -987,7 +970,7 @@ gpd_system_info_requested (GnomePilotClient *gpc,
}
static void
-gpd_destroy (GtkObject *object)
+gpd_dispose (GObject *object)
{
GnomePilotAssistant *gpd = GNOME_PILOT_ASSISTANT (object);
GnomePilotAssistantPrivate *priv;
@@ -999,9 +982,6 @@ gpd_destroy (GtkObject *object)
g_signal_handlers_disconnect_matched (priv->gpc,
G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, object);
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
static void
@@ -1015,10 +995,10 @@ network_device_toggled_callback (GtkRadioButton *btn, void *data)
/* toggled button could be bluetooth or network */
if(btn == GTK_RADIO_BUTTON(priv->device_network) &&
- GTK_TOGGLE_BUTTON(btn)->active) {
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(btn))) {
type = PILOT_DEVICE_NETWORK;
} else if (btn == GTK_RADIO_BUTTON(priv->device_bluetooth) &&
- GTK_TOGGLE_BUTTON(btn)->active) {
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(btn))) {
type = PILOT_DEVICE_BLUETOOTH;
} else {
type = PILOT_DEVICE_SERIAL;
diff --git a/capplet/gnome-pilot-assistant.h b/capplet/gnome-pilot-assistant.h
index a67c810..b81e5db 100644
--- a/capplet/gnome-pilot-assistant.h
+++ b/capplet/gnome-pilot-assistant.h
@@ -34,7 +34,7 @@
#include <config.h>
#endif
-#include <gpilotd/gnome-pilot-client.h>
+#include <gnome-pilot-client.h>
#ifdef __cplusplus
extern "C" {
@@ -53,18 +53,18 @@ typedef struct _GnomePilotAssistantPrivate GnomePilotAssistantPrivate;
typedef struct _GnomePilotAssistantClass GnomePilotAssistantClass;
struct _GnomePilotAssistant {
- GtkObject parent;
+ GObject parent;
GnomePilotAssistantPrivate *priv;
};
struct _GnomePilotAssistantClass {
- GtkObjectClass parent_class;
+ GObjectClass parent_class;
};
GType gnome_pilot_assistant_get_type (void);
-GtkObject *gnome_pilot_assistant_new (GnomePilotClient *gpc);
+GObject *gnome_pilot_assistant_new (GnomePilotClient *gpc);
gboolean gnome_pilot_assistant_run_and_close (GnomePilotAssistant *gpd);
diff --git a/capplet/gnome-pilot-capplet.c b/capplet/gnome-pilot-capplet.c
index 8cf8e9b..83763e2 100644
--- a/capplet/gnome-pilot-capplet.c
+++ b/capplet/gnome-pilot-capplet.c
@@ -69,7 +69,7 @@ struct _GnomePilotCappletPrivate
GtkWidget *devices_delete;
GtkWidget *devices_popup;
- GtkObject *pdialog;
+ GObject *pdialog;
GtkWidget *pilots_combo;
GtkWidget *pilots_username;
GtkWidget *conduit_treeview;
@@ -226,7 +226,6 @@ get_widgets (GnomePilotCapplet *gpcap)
#define GW(name) GTK_WIDGET (gtk_builder_get_object (priv->ui, name))
gtk_window_set_title (GTK_WINDOW (gpcap), _("gnome-pilot Settings"));
- gtk_dialog_set_has_separator (GTK_DIALOG (gpcap), FALSE);
gtk_dialog_add_button (GTK_DIALOG (gpcap),
GTK_STOCK_HELP, GTK_RESPONSE_HELP);
gtk_dialog_add_button (GTK_DIALOG (gpcap),
@@ -235,7 +234,9 @@ get_widgets (GnomePilotCapplet *gpcap)
priv->notebook = GW ("CappletMain");
if (priv->notebook)
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (gpcap)->vbox), priv->notebook);
+ gtk_container_add (GTK_CONTAINER (
+ gtk_dialog_get_content_area (GTK_DIALOG (gpcap))),
+ priv->notebook);
w = GW ("pilots_treeview");
priv->pilots_treeview = g_object_get_data (G_OBJECT (w), "treeview");
@@ -287,31 +288,31 @@ init_widgets (GnomePilotCapplet *gpcap)
priv = gpcap->priv;
/* Button signals */
- g_signal_connect (GTK_OBJECT (priv->pilots_add), "clicked",
+ g_signal_connect (G_OBJECT (priv->pilots_add), "clicked",
G_CALLBACK (gpcap_pilots_add), gpcap);
- g_signal_connect (GTK_OBJECT (priv->pilots_edit), "clicked",
+ g_signal_connect (G_OBJECT (priv->pilots_edit), "clicked",
G_CALLBACK (gpcap_pilots_edit), gpcap);
- g_signal_connect (GTK_OBJECT (priv->pilots_delete), "clicked",
+ g_signal_connect (G_OBJECT (priv->pilots_delete), "clicked",
G_CALLBACK (gpcap_pilots_delete), gpcap);
- g_signal_connect (GTK_OBJECT (priv->devices_add), "clicked",
+ g_signal_connect (G_OBJECT (priv->devices_add), "clicked",
G_CALLBACK (gpcap_devices_add), gpcap);
- g_signal_connect (GTK_OBJECT (priv->devices_edit), "clicked",
+ g_signal_connect (G_OBJECT (priv->devices_edit), "clicked",
G_CALLBACK (gpcap_devices_edit), gpcap);
- g_signal_connect (GTK_OBJECT (priv->devices_delete), "clicked",
+ g_signal_connect (G_OBJECT (priv->devices_delete), "clicked",
G_CALLBACK (gpcap_devices_delete), gpcap);
- g_signal_connect (GTK_OBJECT (priv->conduit_enable), "clicked",
+ g_signal_connect (G_OBJECT (priv->conduit_enable), "clicked",
G_CALLBACK (gpcap_conduits_enable), gpcap);
- g_signal_connect (GTK_OBJECT (priv->conduit_disable), "clicked",
+ g_signal_connect (G_OBJECT (priv->conduit_disable), "clicked",
G_CALLBACK (gpcap_conduits_disable), gpcap);
- g_signal_connect (GTK_OBJECT (priv->conduit_settings), "clicked",
+ g_signal_connect (G_OBJECT (priv->conduit_settings), "clicked",
G_CALLBACK (gpcap_conduits_settings), gpcap);
/* Row selection signals */
@@ -325,11 +326,11 @@ init_widgets (GnomePilotCapplet *gpcap)
G_CALLBACK (gpcap_conduits_selection_changed), gpcap);
/* Popup menu signals */
- g_signal_connect (GTK_OBJECT (priv->pilots_treeview), "button_press_event",
+ g_signal_connect (G_OBJECT (priv->pilots_treeview), "button_press_event",
G_CALLBACK (gpcap_pilots_popup), gpcap);
- g_signal_connect (GTK_OBJECT (priv->devices_treeview), "button_press_event",
+ g_signal_connect (G_OBJECT (priv->devices_treeview), "button_press_event",
G_CALLBACK (gpcap_devices_popup), gpcap);
- g_signal_connect (GTK_OBJECT (priv->conduit_treeview), "button_press_event",
+ g_signal_connect (G_OBJECT (priv->conduit_treeview), "button_press_event",
G_CALLBACK (gpcap_conduits_popup), gpcap);
gtk_widget_show_all (priv->notebook);
@@ -613,7 +614,7 @@ fill_pilots_combo (GnomePilotCapplet *gpcap)
tmp = tmp->next;
}
- g_signal_connect (GTK_OBJECT(priv->pilots_combo),"changed",
+ g_signal_connect (G_OBJECT(priv->pilots_combo),"changed",
G_CALLBACK (gpcap_conduits_choose_pilot),
gpcap);
gtk_combo_box_set_model (GTK_COMBO_BOX (priv->pilots_combo), GTK_TREE_MODEL(store));
@@ -899,7 +900,7 @@ gpcap_devices_add (GtkWidget *widget, gpointer user_data)
{
GnomePilotCapplet *gpcap = GNOME_PILOT_CAPPLET (user_data);
GnomePilotCappletPrivate *priv;
- GtkObject *dlg;
+ GObject *dlg;
GPilotDevice *device;
gboolean res;
@@ -929,7 +930,7 @@ gpcap_devices_edit (GtkWidget *widget, gpointer user_data)
{
GnomePilotCapplet *gpcap = GNOME_PILOT_CAPPLET (user_data);
GnomePilotCappletPrivate *priv;
- GtkObject *dlg;
+ GObject *dlg;
GPilotDevice *device;
GtkTreeIter iter;
gboolean res;
@@ -1344,7 +1345,7 @@ gpcap_dispose (GObject *object)
{
GnomePilotCapplet *gpcap = GNOME_PILOT_CAPPLET (object);
GnomePilotCappletPrivate *priv;
- GtkObjectClass *gppd_class;
+ GObjectClass *gppd_class;
priv = gpcap->priv;
@@ -1365,17 +1366,12 @@ gpcap_dispose (GObject *object)
if (priv->conduit_popup)
gtk_widget_destroy (priv->conduit_popup);
- /* destroy pilot dialog, if it was loaded */
+ /* unref pilot dialog, if it was loaded */
if (priv->pdialog) {
- gppd_class = g_type_class_peek (gnome_pilot_pdialog_get_type());
- if (GTK_OBJECT_CLASS (gppd_class)->destroy)
- GTK_OBJECT_CLASS (gppd_class)->destroy (priv->pdialog);
+ g_object_unref(G_OBJECT(priv->pdialog));
}
g_free (priv);
gpcap->priv = NULL;
}
-
- if (G_OBJECT_CLASS (parent_class)->dispose)
- (* G_OBJECT_CLASS (parent_class)->dispose) (object);
}
diff --git a/capplet/gnome-pilot-capplet.h b/capplet/gnome-pilot-capplet.h
index 7db42f7..c3ae599 100644
--- a/capplet/gnome-pilot-capplet.h
+++ b/capplet/gnome-pilot-capplet.h
@@ -30,7 +30,7 @@
#ifndef _GNOME_PILOT_CAPPLET_H_
#define _GNOME_PILOT_CAPPLET_H_
-#include <gpilotd/gnome-pilot-client.h>
+#include <gnome-pilot-client.h>
#include <gtk/gtk.h>
#ifdef __cplusplus
diff --git a/capplet/gnome-pilot-cdialog.c b/capplet/gnome-pilot-cdialog.c
index faee6de..e290b2c 100644
--- a/capplet/gnome-pilot-cdialog.c
+++ b/capplet/gnome-pilot-cdialog.c
@@ -33,7 +33,7 @@
#include "gnome-pilot-cdialog.h"
-static GtkObjectClass *parent_class = NULL;
+static GObjectClass *parent_class = NULL;
struct _GnomePilotCDialogPrivate
{
@@ -59,7 +59,7 @@ static void fill_widgets (GnomePilotCDialog *gpcd);
static void gpcd_action_activated (GtkWidget *widget, gpointer user_data);
-static void gpcd_destroy (GtkObject *object);
+static void gpcd_dispose (GObject *object);
GType
gnome_pilot_cdialog_get_type (void)
@@ -81,7 +81,7 @@ gnome_pilot_cdialog_get_type (void)
(GInstanceInitFunc) init,
};
- type = g_type_register_static (gtk_object_get_type (), "GnomePilotCDialog", &info, 0);
+ type = g_type_register_static (g_object_get_type (), "GnomePilotCDialog", &info, 0);
}
return type;
@@ -90,13 +90,13 @@ gnome_pilot_cdialog_get_type (void)
static void
class_init (GnomePilotCDialogClass *klass)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
- object_class = GTK_OBJECT_CLASS (klass);
+ object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek (gtk_object_get_type ());
+ parent_class = g_type_class_peek (g_object_get_type ());
- object_class->destroy = gpcd_destroy;
+ object_class->dispose = gpcd_dispose;
}
static void
@@ -133,13 +133,13 @@ init (GnomePilotCDialog *gpcd)
-GtkObject *
+GObject *
gnome_pilot_cdialog_new (ConduitState *state)
{
GnomePilotCDialog *gpcd;
- GtkObject *object;
+ GObject *object;
- object = GTK_OBJECT(g_type_create_instance(GNOME_PILOT_TYPE_CDIALOG));
+ object = G_OBJECT(g_type_create_instance(GNOME_PILOT_TYPE_CDIALOG));
gpcd = GNOME_PILOT_CDIALOG (object);
gpcd->priv->state = state;
@@ -182,7 +182,7 @@ init_widgets (GnomePilotCDialog *gpcd)
priv = gpcd->priv;
- g_signal_connect (GTK_OBJECT (priv->sync_actions), "changed",
+ g_signal_connect (G_OBJECT (priv->sync_actions), "changed",
G_CALLBACK (gpcd_action_activated), gpcd);
}
@@ -282,7 +282,7 @@ gpcd_action_activated (GtkWidget *widget, gpointer user_data)
}
static void
-gpcd_destroy (GtkObject *object)
+gpcd_dispose (GObject *object)
{
GnomePilotCDialog *gpcd = GNOME_PILOT_CDIALOG (object);
GnomePilotCDialogPrivate *priv;
@@ -291,6 +291,4 @@ gpcd_destroy (GtkObject *object)
g_object_unref (G_OBJECT (priv->ui));
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
diff --git a/capplet/gnome-pilot-cdialog.h b/capplet/gnome-pilot-cdialog.h
index 14b3f3a..31afbbc 100644
--- a/capplet/gnome-pilot-cdialog.h
+++ b/capplet/gnome-pilot-cdialog.h
@@ -44,18 +44,18 @@ typedef struct _GnomePilotCDialogPrivate GnomePilotCDialogPrivate;
typedef struct _GnomePilotCDialogClass GnomePilotCDialogClass;
struct _GnomePilotCDialog {
- GtkObject parent;
+ GObject parent;
GnomePilotCDialogPrivate *priv;
};
struct _GnomePilotCDialogClass {
- GtkObjectClass parent_class;
+ GObjectClass parent_class;
};
GType gnome_pilot_cdialog_get_type (void);
-GtkObject *gnome_pilot_cdialog_new (ConduitState *state);
+GObject *gnome_pilot_cdialog_new (ConduitState *state);
GnomePilotConduitSyncType gnome_pilot_cdialog_first_sync_type (GnomePilotCDialog *gpcd);
GnomePilotConduitSyncType gnome_pilot_cdialog_sync_type (GnomePilotCDialog *gpcd);
diff --git a/capplet/gnome-pilot-ddialog.c b/capplet/gnome-pilot-ddialog.c
index 67052b4..aacfab1 100644
--- a/capplet/gnome-pilot-ddialog.c
+++ b/capplet/gnome-pilot-ddialog.c
@@ -33,7 +33,7 @@
#include "gnome-pilot-ddialog.h"
-static GtkObjectClass *parent_class = NULL;
+static GObjectClass *parent_class = NULL;
struct _GnomePilotDDialogPrivate
{
@@ -55,10 +55,8 @@ struct _GnomePilotDDialogPrivate
GtkWidget *device_irda;
GtkWidget *device_network;
GtkWidget *device_bluetooth;
-#ifdef PILOT_LINK_0_12
GtkWidget *libusb_label;
GList *libusb_list;
-#endif
};
static void class_init (GnomePilotDDialogClass *klass);
@@ -69,7 +67,7 @@ static void map_widgets (GnomePilotDDialog *gpdd);
static void init_widgets (GnomePilotDDialog *gpdd);
static void fill_widgets (GnomePilotDDialog *gpdd);
-static void gpdd_destroy (GtkObject *object);
+static void gpdd_dispose (GObject *object);
static void set_widget_visibility_by_type(GnomePilotDDialog *gpdd, int type);
static void network_device_toggled_callback (GtkRadioButton *btn,
void *data);
@@ -93,7 +91,7 @@ gnome_pilot_ddialog_get_type (void)
0,
(GInstanceInitFunc) init,
};
- type = g_type_register_static (gtk_object_get_type (), "GnomePilotDDialog", &info, 0);
+ type = g_type_register_static (g_object_get_type (), "GnomePilotDDialog", &info, 0);
}
return type;
@@ -102,13 +100,13 @@ gnome_pilot_ddialog_get_type (void)
static void
class_init (GnomePilotDDialogClass *klass)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
- object_class = GTK_OBJECT_CLASS (klass);
+ object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek (gtk_object_get_type ());
+ parent_class = g_type_class_peek (g_object_get_type ());
- object_class->destroy = gpdd_destroy;
+ object_class->dispose = gpdd_dispose;
}
static void
@@ -148,13 +146,13 @@ init (GnomePilotDDialog *gpdd)
-GtkObject *
+GObject *
gnome_pilot_ddialog_new (GPilotDevice *device)
{
GnomePilotDDialog *gpdd;
- GtkObject *object;
+ GObject *object;
- object = GTK_OBJECT (g_type_create_instance (GNOME_PILOT_TYPE_DDIALOG));
+ object = G_OBJECT (g_type_create_instance (GNOME_PILOT_TYPE_DDIALOG));
gpdd = GNOME_PILOT_DDIALOG (object);
gpdd->priv->device = device;
@@ -200,20 +198,17 @@ get_widgets (GnomePilotDDialog *gpdd)
model = GTK_TREE_MODEL(gtk_builder_get_object (priv->ui,
"device_port_store"));
gtk_combo_box_set_model (GTK_COMBO_BOX (priv->device_port_combo), model);
- gtk_combo_box_entry_set_text_column(
- GTK_COMBO_BOX_ENTRY (priv->device_port_combo), 0);
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (priv->device_port_combo), 0);
gtk_cell_layout_clear(GTK_CELL_LAYOUT(priv->device_port_combo));
GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (priv->device_port_combo),
renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (priv->device_port_combo),
renderer, "text", 0);
-#ifdef PILOT_LINK_0_12
/* usb: (libusb) pseudo-device is available from pilot-link 0.12.0 */
gtk_list_store_prepend (GTK_LIST_STORE (model), &iter);
gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, "usb:", -1);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->device_usb), 1);
-#endif
fill_speed_combo(GTK_COMBO_BOX(priv->device_speed_combo));
#undef GW
@@ -254,11 +249,11 @@ init_widgets (GnomePilotDDialog *gpdd)
priv = gpdd->priv;
- g_signal_connect (GTK_OBJECT (priv->device_port),"insert-text",
+ g_signal_connect (G_OBJECT (priv->device_port),"insert-text",
G_CALLBACK (insert_device_callback), NULL);
- g_signal_connect (GTK_OBJECT (priv->device_bluetooth), "toggled",
+ g_signal_connect (G_OBJECT (priv->device_bluetooth), "toggled",
G_CALLBACK (network_device_toggled_callback), gpdd);
- g_signal_connect (GTK_OBJECT (priv->device_network), "toggled",
+ g_signal_connect (G_OBJECT (priv->device_network), "toggled",
G_CALLBACK (network_device_toggled_callback), gpdd);
}
@@ -307,7 +302,7 @@ gnome_pilot_ddialog_run_and_close (GnomePilotDDialog *gpdd, GtkWindow *parent)
btn = gtk_dialog_run (GTK_DIALOG (priv->dialog));
if (btn == GTK_RESPONSE_OK) {
- read_device_config (GTK_OBJECT (gpdd), tmpdev);
+ read_device_config (G_OBJECT (gpdd), tmpdev);
if(check_device_settings (tmpdev, &errstr)) {
*priv->device = *tmpdev;
break;
@@ -326,7 +321,7 @@ gnome_pilot_ddialog_run_and_close (GnomePilotDDialog *gpdd, GtkWindow *parent)
}
static void
-gpdd_destroy (GtkObject *object)
+gpdd_dispose (GObject *object)
{
GnomePilotDDialog *gpdd = GNOME_PILOT_DDIALOG (object);
GnomePilotDDialogPrivate *priv;
@@ -335,9 +330,6 @@ gpdd_destroy (GtkObject *object)
gtk_widget_destroy (priv->dialog);
g_object_unref (G_OBJECT (priv->ui));
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
static void
@@ -351,10 +343,10 @@ network_device_toggled_callback (GtkRadioButton *btn, void *data)
/* toggled button could be bluetooth or network */
if(btn == GTK_RADIO_BUTTON(priv->device_network) &&
- GTK_TOGGLE_BUTTON(btn)->active) {
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(btn))) {
type = PILOT_DEVICE_NETWORK;
} else if (btn == GTK_RADIO_BUTTON(priv->device_bluetooth) &&
- GTK_TOGGLE_BUTTON(btn)->active) {
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(btn))) {
type = PILOT_DEVICE_BLUETOOTH;
} else {
type = PILOT_DEVICE_SERIAL;
diff --git a/capplet/gnome-pilot-ddialog.h b/capplet/gnome-pilot-ddialog.h
index 0a8f707..6af33f1 100644
--- a/capplet/gnome-pilot-ddialog.h
+++ b/capplet/gnome-pilot-ddialog.h
@@ -44,18 +44,18 @@ typedef struct _GnomePilotDDialogPrivate GnomePilotDDialogPrivate;
typedef struct _GnomePilotDDialogClass GnomePilotDDialogClass;
struct _GnomePilotDDialog {
- GtkObject parent;
+ GObject parent;
GnomePilotDDialogPrivate *priv;
};
struct _GnomePilotDDialogClass {
- GtkObjectClass parent_class;
+ GObjectClass parent_class;
};
GType gnome_pilot_ddialog_get_type (void);
-GtkObject *gnome_pilot_ddialog_new (GPilotDevice *device);
+GObject *gnome_pilot_ddialog_new (GPilotDevice *device);
gboolean gnome_pilot_ddialog_run_and_close (GnomePilotDDialog *gppd, GtkWindow *parent);
diff --git a/capplet/gnome-pilot-pdialog.c b/capplet/gnome-pilot-pdialog.c
index b175814..b39c3c7 100644
--- a/capplet/gnome-pilot-pdialog.c
+++ b/capplet/gnome-pilot-pdialog.c
@@ -34,7 +34,7 @@
#include "gnome-pilot-pdialog.h"
-static GtkObjectClass *parent_class = NULL;
+static GObjectClass *parent_class = NULL;
struct _GnomePilotPDialogPrivate
{
@@ -57,9 +57,7 @@ struct _GnomePilotPDialogPrivate
GtkWidget *pilot_name;
GtkWidget *pilot_basedir;
-#ifdef PILOT_LINK_0_12
GtkWidget *pilot_charset;
-#endif
GtkWidget *pilot_charset_label;
GtkWidget *pilot_charset_combo;
@@ -90,7 +88,7 @@ static void gppd_system_info_requested (GnomePilotClient *gpc,
const GNOME_Pilot_SysInfo *sysinfo,
gpointer user_data);
-static void gppd_destroy (GtkObject *object);
+static void gppd_dispose (GObject *object);
GType
gnome_pilot_pdialog_get_type (void)
@@ -111,7 +109,7 @@ gnome_pilot_pdialog_get_type (void)
0,
(GInstanceInitFunc) init,
};
- type = g_type_register_static (gtk_object_get_type (), "GnomePilotPDialog", &info, 0);
+ type = g_type_register_static (g_object_get_type (), "GnomePilotPDialog", &info, 0);
}
return type;
@@ -120,13 +118,13 @@ gnome_pilot_pdialog_get_type (void)
static void
class_init (GnomePilotPDialogClass *klass)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
- object_class = GTK_OBJECT_CLASS (klass);
+ object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek (gtk_object_get_type ());
+ parent_class = g_type_class_peek (g_object_get_type ());
- object_class->destroy = gppd_destroy;
+ object_class->dispose = gppd_dispose;
}
static void
@@ -165,13 +163,13 @@ init (GnomePilotPDialog *gppd)
-GtkObject *
+GObject *
gnome_pilot_pdialog_new (GnomePilotClient *gpc, PilotState *state, GPilotPilot *pilot)
{
GnomePilotPDialog *gppd;
- GtkObject *object;
+ GObject *object;
- object = GTK_OBJECT(g_type_create_instance (GNOME_PILOT_TYPE_PDIALOG));
+ object = G_OBJECT(g_type_create_instance (GNOME_PILOT_TYPE_PDIALOG));
gppd = GNOME_PILOT_PDIALOG (object);
gppd->priv->gpc = gpc;
@@ -193,7 +191,7 @@ gnome_pilot_pdialog_new (GnomePilotClient *gpc, PilotState *state, GPilotPilot *
}
void
-gnome_pilot_pdialog_set_pilot (GtkObject *obj, GPilotPilot *pilot)
+gnome_pilot_pdialog_set_pilot (GObject *obj, GPilotPilot *pilot)
{
GnomePilotPDialog *gppd = GNOME_PILOT_PDIALOG (obj);
@@ -222,7 +220,6 @@ get_widgets (GnomePilotPDialog *gppd)
priv->pilot_basedir = GW ("pilot_basedir_entry");
priv->pilot_charset_label = GW ("pilot_charset_label");
priv->pilot_charset_combo = GW ("pilot_charset_combo");
-#ifdef PILOT_LINK_0_12
priv->pilot_charset = gtk_bin_get_child (
GTK_BIN(priv->pilot_charset_combo));
@@ -232,8 +229,7 @@ get_widgets (GnomePilotPDialog *gppd)
GtkTreeModel *model = GTK_TREE_MODEL(gtk_builder_get_object (priv->ui,
"pilot_charset_store"));
gtk_combo_box_set_model (GTK_COMBO_BOX (priv->pilot_charset_combo), model);
- gtk_combo_box_entry_set_text_column(
- GTK_COMBO_BOX_ENTRY (priv->pilot_charset_combo), 0);
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (priv->pilot_charset_combo), 0);
gtk_cell_layout_clear(GTK_CELL_LAYOUT(priv->pilot_charset_combo));
GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (priv->pilot_charset_combo),
@@ -241,7 +237,6 @@ get_widgets (GnomePilotPDialog *gppd)
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (priv->pilot_charset_combo),
renderer, "text", 0);
-#endif
#undef GW
return (priv->dialog
@@ -251,9 +246,7 @@ get_widgets (GnomePilotPDialog *gppd)
&& priv->pilot_send
&& priv->pilot_name
&& priv->pilot_basedir
-#ifdef PILOT_LINK_0_12
&& priv->pilot_charset
-#endif
&& priv->pilot_charset_label
&& priv->pilot_charset_combo);
}
@@ -269,9 +262,7 @@ map_widgets (GnomePilotPDialog *gppd)
g_object_set_data (G_OBJECT (gppd), "pilotid", priv->pilot_id);
g_object_set_data (G_OBJECT (gppd), "pilotname", priv->pilot_name);
g_object_set_data (G_OBJECT (gppd), "basedir", priv->pilot_basedir);
-#ifdef PILOT_LINK_0_12
g_object_set_data (G_OBJECT (gppd), "charset", priv->pilot_charset);
-#endif
}
static void
@@ -282,16 +273,16 @@ init_widgets (GnomePilotPDialog *gppd)
priv = gppd->priv;
/* Button signals */
- g_signal_connect (GTK_OBJECT (priv->pilot_get), "clicked",
+ g_signal_connect (G_OBJECT (priv->pilot_get), "clicked",
G_CALLBACK (gppd_pilot_get), gppd);
- g_signal_connect (GTK_OBJECT (priv->pilot_send), "clicked",
+ g_signal_connect (G_OBJECT (priv->pilot_send), "clicked",
G_CALLBACK (gppd_pilot_send), gppd);
/* Other widget signals */
- g_signal_connect (GTK_OBJECT (priv->pilot_username),"insert-text",
+ g_signal_connect (G_OBJECT (priv->pilot_username),"insert-text",
G_CALLBACK (insert_username_callback), NULL);
- g_signal_connect (GTK_OBJECT (priv->pilot_id),"insert-text",
+ g_signal_connect (G_OBJECT (priv->pilot_id),"insert-text",
G_CALLBACK (insert_numeric_callback), NULL);
}
@@ -311,12 +302,7 @@ fill_widgets (GnomePilotPDialog *gppd)
gtk_entry_set_text (GTK_ENTRY (priv->pilot_name), priv->pilot->name);
gtk_entry_set_text (GTK_ENTRY (priv->pilot_basedir), priv->pilot->sync_options.basedir);
-#ifndef PILOT_LINK_0_12
- gtk_widget_set_sensitive (priv->pilot_charset_label, FALSE);
- gtk_widget_set_sensitive (priv->pilot_charset_combo, FALSE);
-#else
gtk_entry_set_text (GTK_ENTRY (priv->pilot_charset), priv->pilot->pilot_charset);
-#endif
}
}
@@ -334,13 +320,11 @@ gnome_pilot_pdialog_run_and_close (GnomePilotPDialog *gppd, GtkWindow *parent)
if (btn == GTK_RESPONSE_OK) {
if(
-#ifdef PILOT_LINK_0_12
check_pilot_charset(gtk_entry_get_text(
GTK_ENTRY(priv->pilot_charset)), &priv->errstr) &&
-#endif
check_base_directory(gtk_entry_get_text(
GTK_ENTRY(priv->pilot_basedir)), &priv->errstr)) {
- read_pilot_config (GTK_OBJECT (gppd),
+ read_pilot_config (G_OBJECT (gppd),
priv->pilot);
break;
} else {
@@ -398,11 +382,7 @@ gppd_userinfo_requested (GnomePilotClient *gpc,
if (priv->pilot->pilot_username)
g_free (priv->pilot->pilot_username);
-#ifndef PILOT_LINK_0_12
- if (!user->username || (convert_FromPilotChar ("UTF-8", user->username, strlen (user->username), &priv->pilot->pilot_username ) == -1)) {
-#else
if (!user->username || (convert_FromPilotChar_WithCharset ("UTF-8", user->username, strlen (user->username), &priv->pilot->pilot_username, NULL ) == -1)) {
-#endif
priv->pilot->pilot_username = g_strdup (user->username);
}
@@ -512,14 +492,10 @@ gppd_pilot_send (GtkWidget *widget, gpointer user_data)
if (dev != NULL){
pilot = g_new0 (GPilotPilot, 1);
- read_pilot_config (GTK_OBJECT (gppd), pilot);
+ read_pilot_config (G_OBJECT (gppd), pilot);
user.userID = pilot->pilot_id;
-#ifndef PILOT_LINK_0_12
- if (! pilot->pilot_username || (convert_ToPilotChar ("UTF-8", pilot->pilot_username,strlen(pilot->pilot_username),&user.username) == -1)) {
-#else
if (! pilot->pilot_username || (convert_ToPilotChar_WithCharset ("UTF-8", pilot->pilot_username, strlen(pilot->pilot_username), &user.username, NULL) == -1)) {
-#endif
user.username = g_strdup (pilot->pilot_username);
}
if (gnome_pilot_client_set_user_info (priv->gpc,
@@ -543,7 +519,7 @@ gppd_pilot_send (GtkWidget *widget, gpointer user_data)
}
static void
-gppd_destroy (GtkObject *object)
+gppd_dispose (GObject *object)
{
GnomePilotPDialog *gppd = GNOME_PILOT_PDIALOG (object);
GnomePilotPDialogPrivate *priv;
@@ -555,7 +531,5 @@ gppd_destroy (GtkObject *object)
g_signal_handlers_disconnect_matched (priv->gpc,
G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, object);
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+
}
diff --git a/capplet/gnome-pilot-pdialog.h b/capplet/gnome-pilot-pdialog.h
index 587149c..279d376 100644
--- a/capplet/gnome-pilot-pdialog.h
+++ b/capplet/gnome-pilot-pdialog.h
@@ -44,19 +44,19 @@ typedef struct _GnomePilotPDialogPrivate GnomePilotPDialogPrivate;
typedef struct _GnomePilotPDialogClass GnomePilotPDialogClass;
struct _GnomePilotPDialog {
- GtkObject parent;
+ GObject parent;
GnomePilotPDialogPrivate *priv;
};
struct _GnomePilotPDialogClass {
- GtkObjectClass parent_class;
+ GObjectClass parent_class;
};
GType gnome_pilot_pdialog_get_type (void);
-GtkObject *gnome_pilot_pdialog_new (GnomePilotClient *gpc, PilotState *state, GPilotPilot *pilot);
-void gnome_pilot_pdialog_set_pilot (GtkObject *obj, GPilotPilot *pilot);
+GObject *gnome_pilot_pdialog_new (GnomePilotClient *gpc, PilotState *state, GPilotPilot *pilot);
+void gnome_pilot_pdialog_set_pilot (GObject *obj, GPilotPilot *pilot);
gboolean gnome_pilot_pdialog_run_and_close (GnomePilotPDialog *gppd, GtkWindow *dialog);
G_END_DECLS
diff --git a/capplet/gpilotd-control-applet.c b/capplet/gpilotd-control-applet.c
index b9d4ab1..6e5e3c6 100644
--- a/capplet/gpilotd-control-applet.c
+++ b/capplet/gpilotd-control-applet.c
@@ -30,7 +30,7 @@
#include <config.h>
#include <ctype.h>
-#include <gpilotd/gnome-pilot-client.h>
+#include <gnome-pilot-client.h>
#include "gnome-pilot-assistant.h"
#include "gnome-pilot-capplet.h"
@@ -113,7 +113,7 @@ main (int argc, char *argv[])
monitor_pilots (gpc, state);
if (assistant_on) {
- GtkObject *assistant;
+ GObject *assistant;
if (state->pilots!= NULL || state->devices!= NULL) {
error_dialog (NULL, "Cannot run assistant if PDAs or devices already configured"); /* FIXME: Make translatable after string freeze */
@@ -132,7 +132,7 @@ main (int argc, char *argv[])
/* popup the assistant if nothing is configured - assume this is the first time */
if (state->pilots == NULL && state->devices == NULL) {
- GtkObject *assistant;
+ GObject *assistant;
assistant = gnome_pilot_assistant_new (gpc);
assistant_finished = gnome_pilot_assistant_run_and_close (GNOME_PILOT_ASSISTANT (assistant));
diff --git a/capplet/pilot.c b/capplet/pilot.c
index fe2d304..fd0cec4 100644
--- a/capplet/pilot.c
+++ b/capplet/pilot.c
@@ -28,7 +28,7 @@
#include <glib.h>
#include <pi-util.h>
-#include <gpilotd/gnome-pilot-config.h>
+#include <gnome-pilot-config.h>
#include "pilot.h"
#include "util.h"
@@ -64,9 +64,7 @@ copy_pilot (GPilotPilot *pilot, PilotState *dest)
pilot2->creation = pilot->creation;
pilot2->romversion = pilot->romversion;
pilot2->sync_options.basedir = g_strdup (pilot->sync_options.basedir);
-#ifdef PILOT_LINK_0_12
pilot2->pilot_charset = g_strdup (pilot->pilot_charset);
-#endif
dest->pilots = g_list_append (dest->pilots, pilot2);
}
@@ -271,11 +269,7 @@ loadPilotPilot (PilotState *p)
}
g_message ("Pilot id -> %d", pilot->pilot_id);
local_name = g_key_file_get_string (kfile, iPilot, "pilotusername", NULL);
-#ifdef PILOT_LINK_0_12
if (!local_name || (convert_FromPilotChar_WithCharset ("UTF-8", local_name, strlen(local_name), &pilot->pilot_username, NULL) == -1)) {
-#else
- if (!local_name || (convert_FromPilotChar ("UTF-8", local_name, strlen(local_name), &pilot->pilot_username) == -1)) {
-#endif
pilot->pilot_username = g_strdup (local_name);
}
g_free (local_name);
@@ -291,14 +285,11 @@ loadPilotPilot (PilotState *p)
pilot->sync_options.basedir = g_strdup_printf ("%s/%s", g_get_home_dir (), pilot->name);
}
-#ifdef PILOT_LINK_0_12
pilot->pilot_charset = g_key_file_get_string (kfile, iPilot, "charset", NULL);
if (pilot->pilot_charset == NULL)
pilot->pilot_charset =
g_strdup(get_default_pilot_charset());
-#else
pilot->pilot_charset = NULL;
-#endif
pilot->number = i;
@@ -394,19 +385,13 @@ savePilotState (PilotState *state)
g_key_file_set_integer (kfile, iPilot, "pilotid", pilot->pilot_id);
g_key_file_set_integer (kfile, iPilot, "creation", pilot->creation);
g_key_file_set_integer (kfile, iPilot, "romversion", pilot->romversion);
-#ifdef PILOT_LINK_0_12
if (!pilot->pilot_username|| (convert_ToPilotChar_WithCharset ("UTF-8", pilot->pilot_username, strlen (pilot->pilot_username), &local_name, NULL) == -1)) {
-#else
- if (!pilot->pilot_username|| (convert_ToPilotChar ("UTF-8", pilot->pilot_username, strlen (pilot->pilot_username), &local_name) == -1)) {
-#endif
local_name = g_strdup (pilot->pilot_username);
}
g_key_file_set_string (kfile, iPilot, "pilotusername", local_name);
g_free (local_name);
g_key_file_set_string (kfile, iPilot, "basedir", pilot->sync_options.basedir);
-#ifdef PILOT_LINK_0_12
g_key_file_set_string (kfile, iPilot, "charset", pilot->pilot_charset);
-#endif
g_free (iPilot);
tmp = tmp->next;
i++;
diff --git a/capplet/pilot.h b/capplet/pilot.h
index 4b4b564..1e18348 100644
--- a/capplet/pilot.h
+++ b/capplet/pilot.h
@@ -25,10 +25,10 @@
#ifndef GPILOTD_CAPPLET_PILOT_H
#define GPILOTD_CAPPLET_PILOT_H
-#include <gpilotd/gnome-pilot-structures.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
+#include <gnome-pilot-structures.h>
+#include <gnome-pilot-conduit.h>
+#include <gnome-pilot-conduit-management.h>
+#include <gnome-pilot-conduit-config.h>
typedef struct _ConduitState ConduitState;
struct _ConduitState {
@@ -49,7 +49,7 @@ struct _ConduitState {
GnomePilotConduitConfig *config;
GnomePilotConduit *conduit;
GtkWidget *settings_widget;
- GtkObject *settings_widget2;
+ GObject *settings_widget2;
GList *valid_synctypes;
};
diff --git a/capplet/util.c b/capplet/util.c
index 9ff3e4b..f6f0ee7 100644
--- a/capplet/util.c
+++ b/capplet/util.c
@@ -331,10 +331,8 @@ get_default_pilot (PilotState *state)
pilot->name = next_pilot_name (state);
pilot->sync_options.basedir = g_build_filename (g_get_home_dir (),
pilot->name, NULL);
-#ifdef PILOT_LINK_0_12
pilot->pilot_charset =
g_strdup(get_default_pilot_charset());
-#endif
return pilot;
}
@@ -362,7 +360,7 @@ insert_numeric_callback (GtkEditable *editable, const gchar *text,
for (i =0; i<len; i++) {
if (!isdigit (text[i])) {
- g_signal_stop_emission_by_name (GTK_OBJECT (editable), "insert_text");
+ g_signal_stop_emission_by_name (G_OBJECT (editable), "insert_text");
return;
}
}
@@ -379,7 +377,7 @@ insert_username_callback (GtkEditable *editable, const gchar *text,
if (*position == 0 && len > 0) {
utf8_char = g_utf8_get_char_validated (text, -1);
if (!g_unichar_isalpha (utf8_char)) {
- g_signal_stop_emission_by_name (GTK_OBJECT (editable), "insert_text");
+ g_signal_stop_emission_by_name (G_OBJECT (editable), "insert_text");
}
} else {
gchar *p = (char *) text;
@@ -387,7 +385,7 @@ insert_username_callback (GtkEditable *editable, const gchar *text,
while (p && *p) {
utf8_char = g_utf8_get_char_validated (p, -1);
if (!g_unichar_isalnum (utf8_char) && !g_unichar_isspace (utf8_char)) {
- g_signal_stop_emission_by_name (GTK_OBJECT (editable),
+ g_signal_stop_emission_by_name (G_OBJECT (editable),
"insert_text");
}
p = g_utf8_find_next_char (p, NULL);
@@ -405,18 +403,16 @@ insert_device_callback (GtkEditable *editable, const gchar *text,
curname = gtk_entry_get_text (GTK_ENTRY (editable));
if (*curname == '\0' && len > 0) {
if (text[0]!='/'
-#ifdef PILOT_LINK_0_12
/* usb: pseudo-device is available from pilot-link 0.12.0 */
&& text[0]!='u'
-#endif
) {
- g_signal_stop_emission_by_name (GTK_OBJECT (editable), "insert_text");
+ g_signal_stop_emission_by_name (G_OBJECT (editable), "insert_text");
return;
}
} else {
for (i =0;i<len;i++)
if (!(isalnum (text[i]) || text[i]=='/' || text[i]==':')) {
- g_signal_stop_emission_by_name (GTK_OBJECT (editable), "insert_text");
+ g_signal_stop_emission_by_name (G_OBJECT (editable), "insert_text");
return;
}
}
@@ -588,9 +584,6 @@ check_base_directory (const gchar *dir_name, gchar **errstr)
gboolean
check_pilot_charset (const gchar *charset, gchar **errstr)
{
-#ifndef PILOT_LINK_0_12
- return TRUE;
-#else
iconv_t cd;
if (charset == NULL || *charset == '\0')
@@ -607,11 +600,10 @@ check_pilot_charset (const gchar *charset, gchar **errstr)
iconv_close(cd);
return TRUE;
-#endif
}
void
-read_device_config (GtkObject *object, GPilotDevice* device)
+read_device_config (GObject *object, GPilotDevice* device)
{
GtkWidget *port_entry, *speed_combo, *name_entry;
GtkWidget *usb_radio, *irda_radio, *network_radio, *timeout_spinner, *bluetooth_radio;
@@ -653,12 +645,10 @@ read_device_config (GtkObject *object, GPilotDevice* device)
}
void
-read_pilot_config (GtkObject *object, GPilotPilot *pilot)
+read_pilot_config (GObject *object, GPilotPilot *pilot)
{
GtkWidget *id, *name, *pname, *basedir, *menu;
-#ifdef PILOT_LINK_0_12
GtkWidget *charset;
-#endif
const gchar *num;
gint pilotid;
g_return_if_fail (pilot!= NULL);
@@ -667,9 +657,7 @@ read_pilot_config (GtkObject *object, GPilotPilot *pilot)
name = g_object_get_data (G_OBJECT (object), "username");
pname = g_object_get_data (G_OBJECT (object), "pilotname");
basedir = g_object_get_data (G_OBJECT (object), "basedir");
-#ifdef PILOT_LINK_0_12
charset = g_object_get_data (G_OBJECT (object), "charset");
-#endif
menu = g_object_get_data (G_OBJECT (object), "sync_menu");
num = gtk_entry_get_text (GTK_ENTRY (id));
@@ -688,11 +676,9 @@ read_pilot_config (GtkObject *object, GPilotPilot *pilot)
g_free (pilot->sync_options.basedir);
pilot->sync_options.basedir = g_strdup (gtk_entry_get_text (GTK_ENTRY (basedir)));
-#ifdef PILOT_LINK_0_12
if (pilot->pilot_charset)
g_free (pilot->pilot_charset);
pilot->pilot_charset = g_strdup (gtk_entry_get_text (GTK_ENTRY (charset)));
-#endif
}
void
@@ -709,13 +695,10 @@ save_config_and_restart (GnomePilotClient *gpc, PilotState *state)
gboolean
check_device_settings (GPilotDevice *device, char **errstr)
{
-#ifndef WITH_HAL
struct stat buf;
char *usbdevicesfile_str ="/proc/bus/usb/devices";
char *sysfs_dir = "/sys/bus/usb/devices";
-#endif
-#ifdef PILOT_LINK_0_12
/* device->port is ignored for network and bluetooth syncs */
if (strcmp(device->port, "usb:") == 0 && device->type != PILOT_DEVICE_NETWORK
&& device->type != PILOT_DEVICE_BLUETOOTH
@@ -723,7 +706,6 @@ check_device_settings (GPilotDevice *device, char **errstr)
*errstr = g_strdup (_("Device 'usb:' is only valid for devices of type USB"));
return FALSE;
}
-#endif
if (device->type == PILOT_DEVICE_SERIAL) {
g_message ("checking rw on %s", device->port);
@@ -734,7 +716,6 @@ check_device_settings (GPilotDevice *device, char **errstr)
_("Check the permissions on the device and retry"));
return FALSE;
}
-#ifndef WITH_HAL
#ifdef linux
} else if (device->type == PILOT_DEVICE_USB_VISOR) {
/* check sysfs or usbfs is mounted */
@@ -751,7 +732,6 @@ check_device_settings (GPilotDevice *device, char **errstr)
return FALSE;
}
#endif /* linux */
-#endif /* !WITH_HAL */
}
return TRUE;
diff --git a/capplet/util.h b/capplet/util.h
index 3a2eb47..ec203ff 100644
--- a/capplet/util.h
+++ b/capplet/util.h
@@ -22,7 +22,7 @@
*
*/
-#include <gpilotd/gnome-pilot-client.h>
+#include <gnome-pilot-client.h>
#include "pilot.h"
/* Gui routines */
@@ -67,8 +67,8 @@ void error_dialog (GtkWindow *parent, gchar *mesg, ...);
GPilotDevice *choose_pilot_dialog (PilotState *state);
/* Configuration routines */
-void read_device_config (GtkObject *object, GPilotDevice* device);
-void read_pilot_config (GtkObject *object, GPilotPilot *pilot);
+void read_device_config (GObject *object, GPilotDevice* device);
+void read_pilot_config (GObject *object, GPilotPilot *pilot);
void save_config_and_restart (GnomePilotClient *gpc, PilotState *state);
diff --git a/conduits/backup/backup_conduit.c b/conduits/backup/backup_conduit.c
index 0d6e83a..b37d439 100644
--- a/conduits/backup/backup_conduit.c
+++ b/conduits/backup/backup_conduit.c
@@ -49,8 +49,8 @@
#include <errno.h>
#include <dirent.h>
-#include <gpilotd/gnome-pilot-conduit-backup.h>
-#include <gpilotd/gnome-pilot-config.h>
+#include <gnome-pilot-conduit-backup.h>
+#include <gnome-pilot-config.h>
#include "backup_conduit.h"
#define DEBUG 1
@@ -423,11 +423,7 @@ gnome_real_pilot_conduit_backup_backup (GnomePilotConduitBackup *conduit,
int err;
PilotRecord remote;
int wrote;
-#ifdef PILOT_LINK_0_12
pi_buffer_t *piBuf = NULL;
-#else
- unsigned char *buffer = NULL;
-#endif
int len;
g_return_val_if_fail (conduit != NULL, -1);
@@ -516,30 +512,15 @@ gnome_real_pilot_conduit_backup_backup (GnomePilotConduitBackup *conduit,
}
-#ifdef PILOT_LINK_0_12
piBuf = pi_buffer_new (0xffff);
len = dlp_ReadAppBlock (dbinfo->pilot_socket,
dbinfo->db_handle,
0,
-1,
piBuf);
-#else
- buffer = g_new0 (unsigned char, 0xffff);
- remote.buffer = buffer;
-
- len = dlp_ReadAppBlock (dbinfo->pilot_socket,
- dbinfo->db_handle,
- 0,
- buffer,
- 0xffff);
-#endif
if (len > 0)
-#ifdef PILOT_LINK_0_12
pi_file_set_app_info (f, piBuf->data, len);
-#else
- pi_file_set_app_info (f, buffer, len);
-#endif
index = 0;
keep_reading = 1;
@@ -549,64 +530,36 @@ gnome_real_pilot_conduit_backup_backup (GnomePilotConduitBackup *conduit,
int id;
if (PI_DBINFO (dbinfo)->flags & dlpDBFlagResource) {
-#ifdef PILOT_LINK_0_12
keep_reading = (dlp_ReadResourceByIndex (dbinfo->pilot_socket,
dbinfo->db_handle,
index,
piBuf,
&type,
&id) >= 0);
-#else
- keep_reading = (dlp_ReadResourceByIndex (dbinfo->pilot_socket,
- dbinfo->db_handle,
- index,
- remote.buffer,
- &type,
- &id,
- &remote.len) >= 0);
-
-#endif
#ifdef DEBUG_REC_IO
g_message ("read resource %d, type = %s, size %d, , index %d/%d",
-#ifdef PILOT_LINK_0_12
id, pi_unmktag (type), piBuf->used,
-#else
- id, pi_unmktag (type), remote.len,
-#endif
index, entries);
#endif
if (keep_reading > 0) {
-#ifdef PILOT_LINK_0_12
err = pi_file_append_resource (f,
piBuf->data,
piBuf->used,
type,
id);
-#else
- err = pi_file_append_resource (f,
- remote.buffer,
- remote.len,
- type,
- id);
-#endif
if (err < 0) {
g_warning ("error in writing to file");
} else {
wrote++;
#ifdef DEBUG_REC_IO
g_message ("write resource %d, type = %s, size %d, index %d/%d",
-#ifdef PILOT_LINK_0_12
id, pi_unmktag (type), piBuf->used,
-#else
- id, pi_unmktag (type), remote.len,
-#endif
index, entries);
#endif
}
}
} else {
-#ifdef PILOT_LINK_0_12
keep_reading = (dlp_ReadRecordByIndex (dbinfo->pilot_socket,
dbinfo->db_handle,
index,
@@ -614,56 +567,27 @@ gnome_real_pilot_conduit_backup_backup (GnomePilotConduitBackup *conduit,
&remote.recID,
&remote.flags,
&remote.catID) >= 0);
-#else
- keep_reading = (dlp_ReadRecordByIndex (dbinfo->pilot_socket,
- dbinfo->db_handle,
- index,
- remote.buffer,
- &remote.recID,
- &remote.len,
- &remote.flags,
- &remote.catID) >= 0);
-
-#endif
#ifdef DEBUG_REC_IO
g_message ("read record %d, size %d, index %d/%d",
-#ifdef PILOT_LINK_0_12
remote.recID, piBuf->used,
-#else
- remote.recID, remote.len,
-#endif
index, entries);
#endif
if (keep_reading > 0) {
-#ifdef PILOT_LINK_0_12
err = pi_file_append_record (f,
piBuf->data,
piBuf->used,
remote.flags,
remote.catID,
remote.recID);
-#else
- err = pi_file_append_record (f,
- remote.buffer,
- remote.len,
- remote.flags,
- remote.catID,
- remote.recID);
-
-#endif
if (err < 0) {
g_warning ("error in writing to file");
} else {
wrote++;
#ifdef DEBUG_REC_IO
g_message ("write record %d, size %d, index %d/%d",
-#ifdef PILOT_LINK_0_12
id, piBuf->used,
-#else
- id, remote.len,
-#endif
index, entries);
#endif
}
@@ -700,13 +624,9 @@ gnome_real_pilot_conduit_backup_backup (GnomePilotConduitBackup *conduit,
if(f != NULL)
pi_file_close(f);
g_free (name);
-#ifdef PILOT_LINK_0_12
if (piBuf) {
pi_buffer_free (piBuf);
}
-#else
- g_free (buffer);
-#endif
exit:
return result;
}
@@ -858,13 +778,13 @@ insert_dir_callback (GtkEditable *editable, const gchar *text,
curname = gtk_entry_get_text(GTK_ENTRY(editable));
if (*curname == '\0' && len > 0) {
if (isspace(text[0])) {
- g_signal_stop_emission_by_name (GTK_OBJECT(editable), "insert_text");
+ g_signal_stop_emission_by_name (G_OBJECT(editable), "insert_text");
return;
}
} else {
for (i=0; i<len; i++) {
if (isspace(text[i])) {
- g_signal_stop_emission_by_name (GTK_OBJECT(editable),
+ g_signal_stop_emission_by_name (G_OBJECT(editable),
"insert_text");
return;
}
@@ -878,7 +798,7 @@ static GtkWidget
GtkWidget *vbox, *table;
GtkWidget *entry, *label;
GtkWidget *button, *spin;
- GtkObject *adjustment;
+ GObject *adjustment;
AtkObject *atk_widget;
vbox = gtk_vbox_new (FALSE, 8);
@@ -896,7 +816,7 @@ static GtkWidget
gtk_entry_set_max_length(GTK_ENTRY(entry), 128);
g_object_set_data (G_OBJECT(vbox), "dir", entry);
gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 2, 0, 1);
- g_signal_connect(GTK_OBJECT(entry), "insert_text",
+ g_signal_connect(G_OBJECT(entry), "insert_text",
G_CALLBACK(insert_dir_callback),
NULL);
@@ -932,7 +852,7 @@ static GtkWidget
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3,4);
- adjustment = gtk_adjustment_new (0, 0, 100, 1, 1, 1);
+ adjustment = G_OBJECT(gtk_adjustment_new (0, 0, 100, 1, 1, 1));
spin = gtk_spin_button_new (GTK_ADJUSTMENT(adjustment), 1, 0);
g_object_set_data (G_OBJECT(vbox), "no_of_backups", adjustment);
gtk_table_attach_defaults(GTK_TABLE(table), spin, 1, 2, 3, 4);
@@ -1011,7 +931,7 @@ static void
setOptionsCfg(GtkWidget *pilotcfg, ConduitCfg *state)
{
GtkWidget *dir,*updated_only,*remove_deleted;
- GtkObject *adj;
+ GObject *adj;
dir = g_object_get_data (G_OBJECT(pilotcfg), "dir");
updated_only = g_object_get_data (G_OBJECT(pilotcfg), "only_changed");
@@ -1035,7 +955,7 @@ static void
readOptionsCfg(GtkWidget *pilotcfg, ConduitCfg *state)
{
GtkWidget *dir,*updated_only,*remove_deleted;
- GtkObject *adj;
+ GObject *adj;
dir = g_object_get_data (G_OBJECT(pilotcfg), "dir");
updated_only = g_object_get_data (G_OBJECT(pilotcfg), "only_changed");
@@ -1052,7 +972,7 @@ readOptionsCfg(GtkWidget *pilotcfg, ConduitCfg *state)
}
state->updated_only = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(updated_only));
state->remove_deleted = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remove_deleted));
- state->no_of_backups = GTK_ADJUSTMENT(adj)->value;
+ state->no_of_backups = gtk_adjustment_get_value(GTK_ADJUSTMENT(adj));
}
static gint
@@ -1137,6 +1057,6 @@ conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
ConduitCfg *cfg;
cfg = GET_CONDUIT_CFG(conduit);
destroy_configuration(&cfg);
- gtk_object_destroy (GTK_OBJECT (conduit));
+ g_object_unref (G_OBJECT (conduit));
}
diff --git a/conduits/evolution-data-server/address-conduit.c b/conduits/evolution-data-server/address-conduit.c
index 78f8384..64ba5ca 100644
--- a/conduits/evolution-data-server/address-conduit.c
+++ b/conduits/evolution-data-server/address-conduit.c
@@ -40,10 +40,10 @@
#include <libedataserver/e-data-server-util.h>
#include <libedataserverui/e-passwords.h>
#include <libebook/e-book.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
+#include <gnome-pilot-conduit.h>
+#include <gnome-pilot-conduit-sync-abs.h>
+#include <gnome-pilot-conduit-management.h>
+#include <gnome-pilot-conduit-config.h>
#include <e-dialog-widgets.h>
#include <e-pilot-map.h>
#include <e-pilot-settings.h>
@@ -592,7 +592,7 @@ e_addr_gui_new (EPilotSettings *ps)
rows = E_PILOT_SETTINGS_TABLE_ROWS;
lbl = gtk_label_new (_("Default Sync Address:"));
gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
- gui->default_address = gtk_combo_box_new_text ();
+ gui->default_address = gtk_combo_box_text_new ();
for (i = 0; items[i] != NULL; i++) {
gtk_combo_box_append_text (GTK_COMBO_BOX (gui->default_address), items[i]);
}
@@ -750,9 +750,7 @@ static gchar *print_remote (GnomePilotRecord *remote)
{
static gchar buff[ 4096 ];
struct Address addr;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#endif
if (remote == NULL) {
sprintf (buff, "[NULL]");
@@ -760,7 +758,6 @@ static gchar *print_remote (GnomePilotRecord *remote)
}
memset (&addr, 0, sizeof (struct Address));
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
sprintf (buff, "[NULL]");
@@ -772,9 +769,6 @@ static gchar *print_remote (GnomePilotRecord *remote)
}
unpack_Address (&addr, buffer, address_v1);
pi_buffer_free(buffer);
-#else
- unpack_Address (&addr, remote->record, remote->length);
-#endif
g_snprintf (buff, 4096, "['%s' '%s' '%s']",
addr.entry[entryLastname] ?
@@ -1106,11 +1100,7 @@ local_record_to_pilot_record (EAddrLocalRecord *local,
EAddrConduitContext *ctxt)
{
GnomePilotRecord p;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#else
- static gchar record[0xffff];
-#endif
g_assert (local->addr != NULL );
@@ -1126,7 +1116,6 @@ local_record_to_pilot_record (EAddrLocalRecord *local,
/* Generate pilot record structure */
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
@@ -1140,10 +1129,6 @@ local_record_to_pilot_record (EAddrLocalRecord *local,
memcpy(p.record, buffer->data, buffer->used);
pi_buffer_free(buffer);
-#else
- p.record = (guchar *)record;
- p.length = pack_Address (local->addr, p.record, 0xffff);
-#endif
return p;
}
@@ -1171,33 +1156,20 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui
if (local->local.ID != 0) {
struct Address addr;
gint cat = 0;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * record;
record = pi_buffer_new(DLP_BUF_SIZE);
if (record == NULL) {
pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
return;
}
-#else
- gchar record[0xffff];
-#endif
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
ctxt->dbi->db_handle,
-#ifdef PILOT_LINK_0_12
local->local.ID, record,
NULL, NULL, &cat) > 0) {
-#else
- local->local.ID, &record,
- NULL, NULL, NULL, &cat) > 0) {
-#endif
local->local.category = cat;
memset (&addr, 0, sizeof (struct Address));
-#ifdef PILOT_LINK_0_12
unpack_Address (&addr, record, address_v1);
-#else
- unpack_Address (&addr, (guchar *)record, 0xffff);
-#endif
for (i = 0; i < 5; i++) {
if (addr.entry[entryPhone1 + i])
local->addr->entry[entryPhone1 + i] =
@@ -1212,9 +1184,7 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui
}
free_Address (&addr);
}
-#ifdef PILOT_LINK_0_12
pi_buffer_free (record);
-#endif
}
/*Category support*/
@@ -1380,12 +1350,9 @@ ecard_from_remote_record(EAddrConduitContext *ctxt,
EContactField next_mail, next_home, next_work, next_fax;
EContactField next_other, next_main, next_pager, next_mobile;
gint i;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#endif
g_return_val_if_fail(remote!=NULL,NULL);
memset (&address, 0, sizeof (struct Address));
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
@@ -1398,9 +1365,6 @@ ecard_from_remote_record(EAddrConduitContext *ctxt,
}
unpack_Address (&address, buffer, address_v1);
pi_buffer_free(buffer);
-#else
- unpack_Address (&address, remote->record, remote->length);
-#endif
if (in_contact == NULL)
contact = e_contact_new ();
else
@@ -1600,11 +1564,7 @@ pre_sync (GnomePilotConduit *conduit,
gchar *change_id;
gchar *auth;
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-#ifdef PILOT_LINK_0_12
pi_buffer_t *buffer;
-#else
- guchar *buf;
-#endif
abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
@@ -1614,12 +1574,10 @@ pre_sync (GnomePilotConduit *conduit,
ctxt->dbi = dbi;
-#ifdef PILOT_LINK_0_12
if (NULL == dbi->pilotInfo->pilot_charset)
ctxt->pilot_charset = NULL;
else
ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
-#endif
if (ctxt->cfg->source) {
ctxt->ebook = e_book_new (ctxt->cfg->source, NULL);
@@ -1697,7 +1655,6 @@ pre_sync (GnomePilotConduit *conduit,
gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
return pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
@@ -1705,11 +1662,6 @@ pre_sync (GnomePilotConduit *conduit,
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
DLP_BUF_SIZE, buffer);
-#else
- buf = (guchar *)g_malloc (0xffff);
- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
- (guchar *)buf, 0xffff);
-#endif
if (len < 0) {
WARN (_("Could not read pilot's Address application block"));
WARN ("dlp_ReadAppBlock(...) = %d", len);
@@ -1717,13 +1669,8 @@ pre_sync (GnomePilotConduit *conduit,
_("Could not read pilot's Address application block"));
return -1;
}
-#ifdef PILOT_LINK_0_12
unpack_AddressAppInfo (&(ctxt->ai), buffer->data, len);
pi_buffer_free (buffer);
-#else
- unpack_AddressAppInfo (&(ctxt->ai), buf, len);
- g_free (buf);
-#endif
check_for_slow_setting (conduit, ctxt);
if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
|| ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
@@ -2201,7 +2148,7 @@ revert_settings (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
GnomePilotConduit *
conduit_get_gpilot_conduit (guint32 pilot_id)
{
- GtkObject *retval;
+ GObject *retval;
EAddrConduitContext *ctxt;
LOG (g_message ( "in address's conduit_get_gpilot_conduit\n" ));
@@ -2251,5 +2198,5 @@ conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
e_addr_context_destroy (ctxt);
- gtk_object_destroy (GTK_OBJECT (conduit));
+ g_object_unref (G_OBJECT (conduit));
}
diff --git a/conduits/evolution-data-server/calendar-conduit.c b/conduits/evolution-data-server/calendar-conduit.c
index 5516bde..08e162a 100644
--- a/conduits/evolution-data-server/calendar-conduit.c
+++ b/conduits/evolution-data-server/calendar-conduit.c
@@ -37,10 +37,10 @@
#include <pi-socket.h>
#include <pi-dlp.h>
#include <pi-datebook.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
+#include <gnome-pilot-conduit.h>
+#include <gnome-pilot-conduit-sync-abs.h>
+#include <gnome-pilot-conduit-management.h>
+#include <gnome-pilot-conduit-config.h>
#include <e-pilot-map.h>
#include <e-pilot-settings.h>
#include <e-pilot-util.h>
@@ -411,9 +411,7 @@ static gchar *print_remote (GnomePilotRecord *remote)
{
static gchar buff[ 4096 ];
struct Appointment appt;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#endif
if (remote == NULL) {
sprintf (buff, "[NULL]");
@@ -421,7 +419,6 @@ static gchar *print_remote (GnomePilotRecord *remote)
}
memset (&appt, 0, sizeof (struct Appointment));
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
sprintf (buff, "[NULL]");
@@ -434,9 +431,6 @@ static gchar *print_remote (GnomePilotRecord *remote)
unpack_Appointment (&appt, buffer, datebook_v1);
pi_buffer_free(buffer);
-#else
- unpack_Appointment (&appt, remote->record, remote->length);
-#endif
g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
mktime (&appt.begin),
mktime (&appt.end),
@@ -843,11 +837,7 @@ local_record_to_pilot_record (ECalLocalRecord *local,
ECalConduitContext *ctxt)
{
GnomePilotRecord p;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#else
- static gchar record[0xffff];
-#endif
memset(&p, 0, sizeof (p));
@@ -863,7 +853,6 @@ local_record_to_pilot_record (ECalLocalRecord *local,
p.secret = local->local.secret;
/* Generate pilot record structure */
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
@@ -876,10 +865,6 @@ local_record_to_pilot_record (ECalLocalRecord *local,
memcpy(p.record, buffer->data, buffer->used);
pi_buffer_free(buffer);
-#else
- p.record = (guchar *)record;
- p.length = pack_Appointment (local->appt, p.record, 0xffff);
-#endif
return p;
}
@@ -915,7 +900,6 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
*/
if (local->local.ID != 0) {
gint cat = 0;
-#ifdef PILOT_LINK_0_12
struct Appointment appt;
pi_buffer_t * record;
@@ -924,34 +908,19 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
return;
}
-#else
- struct Appointment appt;
- gchar record[0xffff];
-#endif
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
ctxt->dbi->db_handle,
-#ifdef PILOT_LINK_0_12
local->local.ID, record,
NULL, NULL, &cat) > 0) {
-#else
- local->local.ID, &record,
- NULL, NULL, NULL, &cat) > 0) {
-#endif
local->local.category = cat;
memset (&appt, 0, sizeof (struct Appointment));
-#ifdef PILOT_LINK_0_12
unpack_Appointment (&appt, record, datebook_v1);
-#else
- unpack_Appointment (&appt, (guchar *)record, 0xffff);
-#endif
local->appt->alarm = appt.alarm;
local->appt->advance = appt.advance;
local->appt->advanceUnits = appt.advanceUnits;
free_Appointment (&appt);
}
-#ifdef PILOT_LINK_0_12
pi_buffer_free (record);
-#endif
}
/*Category support*/
@@ -1220,12 +1189,9 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
GSList *edl = NULL;
gchar *txt;
gint pos, i;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#endif
g_return_val_if_fail (remote != NULL, NULL);
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
return NULL;
@@ -1238,10 +1204,6 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
unpack_Appointment (&appt, buffer, datebook_v1);
pi_buffer_free(buffer);
-#else
- memset (&appt, 0, sizeof (struct Appointment));
- unpack_Appointment (&appt, remote->record, remote->length);
-#endif
if (in_comp == NULL) {
comp = e_cal_component_new ();
e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
@@ -1511,21 +1473,17 @@ pre_sync (GnomePilotConduit *conduit,
gchar *filename, *change_id;
icalcomponent *icalcomp;
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#endif
abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
LOG (g_message ( "---------------------------------------------------------\n" ));
LOG (g_message ( "pre_sync: Calendar Conduit v.%s", CONDUIT_VERSION ));
ctxt->dbi = dbi;
-#ifdef PILOT_LINK_0_12
if (NULL == dbi->pilotInfo->pilot_charset)
ctxt->pilot_charset = NULL;
else
ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
-#endif
ctxt->client = NULL;
/* Get the timezone */
@@ -1627,7 +1585,6 @@ pre_sync (GnomePilotConduit *conduit,
gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
@@ -1637,11 +1594,6 @@ pre_sync (GnomePilotConduit *conduit,
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
DLP_BUF_SIZE,
buffer);
-#else
- buf = (guchar *)g_malloc (0xffff);
- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
- (guchar *)buf, 0xffff);
-#endif
if (len < 0) {
WARN (_("Could not read pilot's Calendar application block"));
WARN ("dlp_ReadAppBlock(...) = %d", len);
@@ -1649,11 +1601,9 @@ pre_sync (GnomePilotConduit *conduit,
_("Could not read pilot's Calendar application block"));
return -1;
}
-#ifdef PILOT_LINK_0_12
buf = g_new0 (unsigned char,buffer->used);
memcpy(buf, buffer->data, buffer->used);
pi_buffer_free(buffer);
-#endif
unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
/* unpack_CategoryAppInfo (&(ctxt->ai.category), buf, len); */
g_free (buf);
@@ -2126,7 +2076,7 @@ revert_settings (GnomePilotConduit *conduit, ECalConduitContext *ctxt)
GnomePilotConduit *
conduit_get_gpilot_conduit (guint32 pilot_id)
{
- GtkObject *retval;
+ GObject *retval;
ECalConduitContext *ctxt;
LOG (g_message ( "in calendar's conduit_get_gpilot_conduit\n" ));
@@ -2170,11 +2120,11 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
void
conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
{
- GtkObject *obj = GTK_OBJECT (conduit);
+ GObject *obj = G_OBJECT (conduit);
ECalConduitContext *ctxt;
- ctxt = g_object_get_data (G_OBJECT (obj), "calconduit_context");
+ ctxt = g_object_get_data (obj, "calconduit_context");
e_calendar_context_destroy (ctxt);
- gtk_object_destroy (obj);
+ g_object_unref (obj);
}
diff --git a/conduits/evolution-data-server/e-pilot-util.c b/conduits/evolution-data-server/e-pilot-util.c
index 3d8d2cd..4926861 100644
--- a/conduits/evolution-data-server/e-pilot-util.c
+++ b/conduits/evolution-data-server/e-pilot-util.c
@@ -39,12 +39,8 @@ e_pilot_utf8_to_pchar (const gchar *string, const gchar *pilot_charset)
if (!string)
return NULL;
-#ifdef PILOT_LINK_0_12
res = convert_ToPilotChar_WithCharset ("UTF-8", string, strlen (string),
&pstring, pilot_charset);
-#else
- res = convert_ToPilotChar ("UTF-8", string, strlen (string), &pstring);
-#endif
if (res != 0)
pstring = strdup (string);
@@ -61,12 +57,8 @@ e_pilot_utf8_from_pchar (const gchar *string, const gchar *pilot_charset)
if (!string)
return NULL;
-#ifdef PILOT_LINK_0_12
res = convert_FromPilotChar_WithCharset ("UTF-8", string, strlen (string),
&ustring, pilot_charset);
-#else
- res = convert_FromPilotChar ("UTF-8", string, strlen (string), &ustring);
-#endif
if (res != 0)
ustring = strdup (string);
diff --git a/conduits/evolution-data-server/memo-conduit.c b/conduits/evolution-data-server/memo-conduit.c
index 0f64316..ff038cc 100644
--- a/conduits/evolution-data-server/memo-conduit.c
+++ b/conduits/evolution-data-server/memo-conduit.c
@@ -39,10 +39,10 @@
#include <pi-dlp.h>
#include <pi-memo.h>
#include <libical/icaltypes.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
+#include <gnome-pilot-conduit.h>
+#include <gnome-pilot-conduit-sync-abs.h>
+#include <gnome-pilot-conduit-management.h>
+#include <gnome-pilot-conduit-config.h>
#include <e-pilot-map.h>
#include <e-pilot-settings.h>
#include <e-pilot-util.h>
@@ -322,9 +322,7 @@ static gchar *print_remote (GnomePilotRecord *remote)
{
static gchar buff[ 64 ];
struct Memo memo;
-#ifdef PILOT_LINK_0_12
pi_buffer_t *buffer;
-#endif
if (remote == NULL) {
sprintf (buff, "[NULL]");
@@ -332,7 +330,6 @@ static gchar *print_remote (GnomePilotRecord *remote)
}
memset (&memo, 0, sizeof (struct Memo));
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
sprintf (buff, "[NULL]");
@@ -345,9 +342,6 @@ static gchar *print_remote (GnomePilotRecord *remote)
unpack_Memo (&memo, buffer, memo_v1);
pi_buffer_free(buffer);
-#else
- unpack_Memo (&memo, remote->record, remote->length);
-#endif
g_snprintf (buff, 64, "['%s']",
memo.text ?
memo.text : "");
@@ -469,11 +463,7 @@ local_record_to_pilot_record (EMemoLocalRecord *local,
EMemoConduitContext *ctxt)
{
GnomePilotRecord p;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#else
- static gchar record[0xffff];
-#endif
memset(&p, 0, sizeof (p));
@@ -491,7 +481,6 @@ local_record_to_pilot_record (EMemoLocalRecord *local,
p.secret = local->local.secret;
/* Generate pilot record structure */
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
@@ -504,10 +493,6 @@ local_record_to_pilot_record (EMemoLocalRecord *local,
memcpy(p.record, buffer->data, buffer->used);
pi_buffer_free(buffer);
-#else
- p.record = (guchar *)record;
- p.length = pack_Memo (local->memo, p.record, 0xffff);
-#endif
return p;
}
@@ -544,26 +529,19 @@ local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoCondu
/* Don't overwrite the category */
if (local->local.ID != 0) {
-#ifdef PILOT_LINK_0_12
struct Memo memo;
pi_buffer_t * record;
-#else
- gchar record[0xffff];
-#endif
gint cat = 0;
-#ifdef PILOT_LINK_0_12
record = pi_buffer_new(DLP_BUF_SIZE);
if (record == NULL) {
pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
return;
}
-#endif
LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n"));
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
ctxt->dbi->db_handle,
-#ifdef PILOT_LINK_0_12
local->local.ID, record,
NULL, NULL, &cat) > 0) {
local->local.category = cat;
@@ -573,12 +551,6 @@ local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoCondu
free_Memo (&memo);
}
pi_buffer_free (record);
-#else
- local->local.ID, &record,
- NULL, NULL, NULL, &cat) > 0) {
- local->local.category = cat;
- }
-#endif
LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n"));
}
@@ -661,12 +633,9 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
icaltimezone *utc_zone;
gchar *txt, *txt2, *txt3;
gint i;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#endif
g_return_val_if_fail (remote != NULL, NULL);
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
return NULL;
@@ -678,10 +647,6 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
unpack_Memo (&memo, buffer, memo_v1);
pi_buffer_free(buffer);
-#else
- memset (&memo, 0, sizeof (struct Memo));
- unpack_Memo (&memo, remote->record, remote->length);
-#endif
utc_zone = icaltimezone_get_utc_timezone ();
now = icaltime_from_timet_with_zone (time (NULL), FALSE,
@@ -802,9 +767,7 @@ pre_sync (GnomePilotConduit *conduit,
gchar *filename, *change_id;
icalcomponent *icalcomp;
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#endif
abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
@@ -815,12 +778,10 @@ pre_sync (GnomePilotConduit *conduit,
ctxt->dbi = dbi;
ctxt->client = NULL;
-#ifdef PILOT_LINK_0_12
if (NULL == dbi->pilotInfo->pilot_charset)
ctxt->pilot_charset = NULL;
else
ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
-#endif
if (start_calendar_server (ctxt) != 0) {
WARN(_("Could not start evolution-data-server"));
@@ -901,7 +862,6 @@ pre_sync (GnomePilotConduit *conduit,
g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
num_records, add_records, mod_records, del_records);
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
@@ -911,11 +871,6 @@ pre_sync (GnomePilotConduit *conduit,
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
DLP_BUF_SIZE,
buffer);
-#else
- buf = (guchar *)g_malloc (0xffff);
- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
- (guchar *)buf, 0xffff);
-#endif
if (len < 0) {
WARN (_("Could not read pilot's Memo application block"));
WARN ("dlp_ReadAppBlock(...) = %d", len);
@@ -923,14 +878,10 @@ pre_sync (GnomePilotConduit *conduit,
_("Could not read pilot's Memo application block"));
return -1;
}
-#ifdef PILOT_LINK_0_12
buf = g_new0 (unsigned char,buffer->used);
memcpy(buf, buffer->data, buffer->used);
unpack_MemoAppInfo (&(ctxt->ai), buf, len);
pi_buffer_free(buffer);
-#else
- unpack_MemoAppInfo (&(ctxt->ai), buf, len);
-#endif
g_free (buf);
@@ -1394,7 +1345,7 @@ revert_settings (GnomePilotConduit *conduit, EMemoConduitContext *ctxt)
GnomePilotConduit *
conduit_get_gpilot_conduit (guint32 pilot_id)
{
- GtkObject *retval;
+ GObject *retval;
EMemoConduitContext *ctxt;
LOG (g_message ( "in memo's conduit_get_gpilot_conduit\n" ));
@@ -1437,11 +1388,11 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
void
conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
{
- GtkObject *obj = GTK_OBJECT (conduit);
+ GObject *obj = G_OBJECT (conduit);
EMemoConduitContext *ctxt;
- ctxt = g_object_get_data (G_OBJECT (obj), "memoconduit_context");
+ ctxt = g_object_get_data (obj, "memoconduit_context");
e_memo_context_destroy (ctxt);
- gtk_object_destroy (obj);
+ g_object_unref (obj);
}
diff --git a/conduits/evolution-data-server/todo-conduit.c b/conduits/evolution-data-server/todo-conduit.c
index bf65623..2111f88 100644
--- a/conduits/evolution-data-server/todo-conduit.c
+++ b/conduits/evolution-data-server/todo-conduit.c
@@ -41,10 +41,10 @@
#include <pi-dlp.h>
#include <pi-todo.h>
#include <libical/icaltypes.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
+#include <gnome-pilot-conduit.h>
+#include <gnome-pilot-conduit-sync-abs.h>
+#include <gnome-pilot-conduit-management.h>
+#include <gnome-pilot-conduit-config.h>
#include <e-pilot-map.h>
#include <e-pilot-settings.h>
#include <e-pilot-util.h>
@@ -213,7 +213,7 @@ e_todo_gui_new (EPilotSettings *ps)
{
EToDoConduitGui *gui;
GtkWidget *lbl;
- GtkObject *adj;
+ GObject *adj;
gint rows;
g_return_val_if_fail (ps != NULL, NULL);
@@ -393,16 +393,13 @@ static gchar *print_remote (GnomePilotRecord *remote, const gchar *pilot_charset
{
static gchar buff[ 4096 ];
struct ToDo todo;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#endif
if (remote == NULL) {
sprintf (buff, "[NULL]");
return buff;
}
memset (&todo, 0, sizeof (struct ToDo));
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
sprintf (buff, "[NULL]");
@@ -414,9 +411,6 @@ static gchar *print_remote (GnomePilotRecord *remote, const gchar *pilot_charset
}
unpack_ToDo (&todo, buffer, todo_v1);
pi_buffer_free(buffer);
-#else
- unpack_ToDo (&todo, remote->record, remote->length);
-#endif
g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s' %d]",
todo.indefinite,
mktime (&todo.due),
@@ -610,11 +604,7 @@ local_record_to_pilot_record (EToDoLocalRecord *local,
EToDoConduitContext *ctxt)
{
GnomePilotRecord p;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#else
- static gchar record[0xffff];
-#endif
g_assert (local->comp != NULL);
g_assert (local->todo != NULL );
@@ -632,7 +622,6 @@ local_record_to_pilot_record (EToDoLocalRecord *local,
p.secret = local->local.secret;
/* Generate pilot record structure */
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
@@ -645,10 +634,6 @@ local_record_to_pilot_record (EToDoLocalRecord *local,
memcpy(p.record, buffer->data, buffer->used);
pi_buffer_free(buffer);
-#else
- p.record = (guchar *)record;
- p.length = pack_ToDo (local->todo, p.record, 0xffff);
-#endif
return p;
}
@@ -686,31 +671,20 @@ local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoCondu
/* Don't overwrite the category */
if (local->local.ID != 0) {
gint cat = 0;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * record;
record = pi_buffer_new(DLP_BUF_SIZE);
if (record == NULL) {
pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
return;
}
-#else
- gchar record[0xffff];
-#endif
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
ctxt->dbi->db_handle,
-#ifdef PILOT_LINK_0_12
local->local.ID, record,
NULL, NULL, &cat) > 0) {
-#else
- local->local.ID, &record,
- NULL, NULL, NULL, &cat) > 0) {
-#endif
local->local.category = cat;
}
-#ifdef PILOT_LINK_0_12
pi_buffer_free(record);
-#endif
}
/*Category support*/
@@ -832,13 +806,10 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
icaltimezone *utc_zone;
gint priority;
gchar *txt;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#endif
g_return_val_if_fail (remote != NULL, NULL);
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
return NULL;
@@ -850,10 +821,6 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
unpack_ToDo (&todo, buffer, todo_v1);
pi_buffer_free(buffer);
-#else
- memset (&todo, 0, sizeof (struct ToDo));
- unpack_ToDo (&todo, remote->record, remote->length);
-#endif
utc_zone = icaltimezone_get_utc_timezone ();
now = icaltime_from_timet_with_zone (time (NULL), FALSE,
@@ -997,9 +964,7 @@ pre_sync (GnomePilotConduit *conduit,
gchar *filename, *change_id;
icalcomponent *icalcomp;
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-#ifdef PILOT_LINK_0_12
pi_buffer_t * buffer;
-#endif
abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
@@ -1010,12 +975,10 @@ pre_sync (GnomePilotConduit *conduit,
ctxt->dbi = dbi;
ctxt->client = NULL;
-#ifdef PILOT_LINK_0_12
if (NULL == dbi->pilotInfo->pilot_charset)
ctxt->pilot_charset = NULL;
else
ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
-#endif
/* Get the timezone */
ctxt->timezone = get_default_timezone ();
@@ -1093,7 +1056,6 @@ pre_sync (GnomePilotConduit *conduit,
g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
num_records, add_records, mod_records, del_records);
-#ifdef PILOT_LINK_0_12
buffer = pi_buffer_new(DLP_BUF_SIZE);
if (buffer == NULL) {
pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
@@ -1102,11 +1064,6 @@ pre_sync (GnomePilotConduit *conduit,
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
DLP_BUF_SIZE,
buffer);
-#else
- buf = (guchar *)g_malloc (0xffff);
- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
- (guchar *)buf, 0xffff);
-#endif
if (len < 0) {
WARN (_("Could not read pilot's ToDo application block"));
WARN ("dlp_ReadAppBlock(...) = %d", len);
@@ -1115,11 +1072,9 @@ pre_sync (GnomePilotConduit *conduit,
return -1;
}
-#ifdef PILOT_LINK_0_12
buf = g_new0 (unsigned char,buffer->used);
memcpy(buf, buffer->data,buffer->used);
pi_buffer_free(buffer);
-#endif
unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
g_free (buf);
@@ -1586,7 +1541,7 @@ revert_settings (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)
GnomePilotConduit *
conduit_get_gpilot_conduit (guint32 pilot_id)
{
- GtkObject *retval;
+ GObject *retval;
EToDoConduitContext *ctxt;
LOG (g_message ( "in todo's conduit_get_gpilot_conduit\n" ));
@@ -1629,11 +1584,11 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
void
conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
{
- GtkObject *obj = GTK_OBJECT (conduit);
+ GObject *obj = G_OBJECT (conduit);
EToDoConduitContext *ctxt;
- ctxt = g_object_get_data (G_OBJECT (obj), "todoconduit_context");
+ ctxt = g_object_get_data (obj, "todoconduit_context");
e_todo_context_destroy (ctxt);
- gtk_object_destroy (obj);
+ g_object_unref (obj);
}
diff --git a/conduits/file/file_conduit.c b/conduits/file/file_conduit.c
index 927be43..4533db2 100644
--- a/conduits/file/file_conduit.c
+++ b/conduits/file/file_conduit.c
@@ -39,7 +39,7 @@
#include <pwd.h>
#include <signal.h>
-#include <gpilotd/gnome-pilot-conduit-file.h>
+#include <gnome-pilot-conduit-file.h>
/* pilot stuff begin */
#include <stdio.h>
diff --git a/conduits/file/gpilot_install_file.c b/conduits/file/gpilot_install_file.c
index 84dd5bc..5f9a18f 100644
--- a/conduits/file/gpilot_install_file.c
+++ b/conduits/file/gpilot_install_file.c
@@ -23,7 +23,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
-#include <gpilotd/gnome-pilot-client.h>
+#include <gnome-pilot-client.h>
GnomePilotClient *gpc;
GSList *handles;
@@ -102,7 +102,7 @@ main (int argc, char *argv[])
gpc = GNOME_PILOT_CLIENT (gnome_pilot_client_new ());
g_object_ref_sink (G_OBJECT (gpc));
- g_signal_connect (GTK_OBJECT (gpc),"completed_request", G_CALLBACK(gpilotd_request_completed), NULL);
+ g_signal_connect (G_OBJECT (gpc),"completed_request", G_CALLBACK(gpilotd_request_completed), NULL);
gnome_pilot_client_connect_to_daemon (gpc);
if (pilot_arg!=NULL) {
diff --git a/conduits/test/test_conduit.c b/conduits/test/test_conduit.c
index 191032c..a1191d5 100644
--- a/conduits/test/test_conduit.c
+++ b/conduits/test/test_conduit.c
@@ -21,8 +21,8 @@
* Author: JP Rosevear
*/
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-standard.h>
+#include <gnome-pilot-conduit.h>
+#include <gnome-pilot-conduit-standard.h>
#define CONDUIT_VERSION "0.0.1"
#ifdef G_LOG_DOMAIN
@@ -79,7 +79,7 @@ synchronize(GnomePilotConduit *c, GnomePilotDBInfo *dbi)
GnomePilotConduit *
conduit_get_gpilot_conduit(guint32 pilotId)
{
- GtkObject *retval;
+ GObject *retval;
retval = gnome_pilot_conduit_standard_new ("MailDB",0x6d61696c, NULL);
g_assert(retval != NULL);
@@ -97,6 +97,6 @@ conduit_get_gpilot_conduit(guint32 pilotId)
void
conduit_destroy_gpilot_conduit(GnomePilotConduit *c)
{
- gtk_object_destroy(GTK_OBJECT(c));
+ g_object_unref(G_OBJECT(c));
}
diff --git a/configure.ac b/configure.ac
index 8dff6eb..6ae0030 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,12 @@ dnl ******************************
dnl Version
dnl ******************************
m4_define([gnome_pilot_major], [2])
-m4_define([gnome_pilot_revision], [32])
-m4_define([gnome_pilot_patchlevel], [1])
+m4_define([gnome_pilot_revision], [95])
+m4_define([gnome_pilot_patchlevel], [5])
m4_define([gnome_pilot_version],
[gnome_pilot_major.gnome_pilot_revision.gnome_pilot_patchlevel])
+
dnl *****************************
dnl Initialize autoconf/automake
dnl *****************************
@@ -20,7 +21,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
dnl ******************************
dnl Library Versions
dnl ******************************
-GPILOTD_CURRENT=5
+GPILOTD_CURRENT=0
GPILOTD_REVISION=0
GPILOTD_AGE=0
@@ -28,7 +29,7 @@ AC_SUBST(GPILOTD_CURRENT)
AC_SUBST(GPILOTD_REVISION)
AC_SUBST(GPILOTD_AGE)
-GPILOTD_CONDUIT_CURRENT=3
+GPILOTD_CONDUIT_CURRENT=0
GPILOTD_CONDUIT_REVISION=0
GPILOTD_CONDUIT_AGE=0
@@ -36,7 +37,7 @@ AC_SUBST(GPILOTD_CONDUIT_CURRENT)
AC_SUBST(GPILOTD_CONDUIT_REVISION)
AC_SUBST(GPILOTD_CONDUIT_AGE)
-GPILOTD_CM_CURRENT=4
+GPILOTD_CM_CURRENT=0
GPILOTD_CM_REVISION=0
GPILOTD_CM_AGE=0
@@ -44,6 +45,10 @@ AC_SUBST(GPILOTD_CM_CURRENT)
AC_SUBST(GPILOTD_CM_REVISION)
AC_SUBST(GPILOTD_CM_AGE)
+BASE_VERSION=3.0
+AC_SUBST(BASE_VERSION)
+AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", "Base version (Major.Minor)")
+
dnl ******************************
dnl Basic Checks
dnl ******************************
@@ -65,17 +70,13 @@ CFLAGS="$CFLAGS $WARN_CFLAGS"
dnl ******************************
dnl Pilot Link Check
dnl ******************************
-PILOT_LINK_CHECK(0.11.4)
+PILOT_LINK_CHECK(0.12.0)
AC_SUBST(PILOT_LINK_MAJOR)
AC_SUBST(PILOT_LINK_MINOR)
AC_SUBST(PILOT_LINK_MICRO)
AC_SUBST(PILOT_LINK_PATCH)
AC_SUBST(PILOT_LINK_VERSION)
-if test $PILOT_LINK_MINOR -ge 12; then
- AC_DEFINE(PILOT_LINK_0_12,,[Building against pilot-link 0.12.0 or greater])
-fi
-
dnl ******************************
dnl Various Device Support Checks
dnl ******************************
@@ -99,46 +100,6 @@ if test x"$do_network" = x"yes"; then
AC_DEFINE(WITH_NETWORK,,"With Network Sync Support")
fi
-dnl ******************************
-dnl Whether to use HAL or GUDEV
-dnl ******************************
-dnl Default: use gudev it if it is available
-GUDEV_REQUIRED="gudev-1.0"
-DBUS_REQUIRED="dbus-glib-1 >= 0.31"
-HAL_REQUIRED="hal >= 0.5.4"
-
-AC_ARG_WITH([hal],
- [AS_HELP_STRING([--with-hal],
- [Force use of LIBHAL.])],
- [with_hal="$withval"],[with_hal="no"])
-
-with_gudev="no"
-
-dnl if --with-hal is specified, then error if we don't find it
-PKG_CHECK_MODULES(HAL,
- [$DBUS_REQUIRED $HAL_REQUIRED],
- [found_hal="yes"],[found_hal="no"])
-PKG_CHECK_MODULES(GUDEV, $GUDEV_REQUIRED,
- [found_gudev="yes"],[found_gudev="no"])
-
-if test x"$with_hal" = x"yes"; then
- if test x"$found_hal" = x"yes"; then
- AC_DEFINE(WITH_HAL,,"Using LIBHAL")
- else
- AC_MSG_ERROR([LIBHAL Library requirements ($DBUS_REQUIRED, $HAL_REQUIRED)
-not met; consider using --disable-hal option, or adjusting the PKG_CONFIG_PATH
-environment variable if your libraries are in a nonstandard prefix so pkg-config
-can find them.])
- fi
-else
-dnl if --with-hal wasn't specified, carry on without HAL if it's not found.
- with_hal="no"
- if test x"$found_gudev" = x"yes"; then
- with_gudev="yes"
- AC_DEFINE(WITH_GUDEV,,"Using GUDEV")
- fi
-fi
-
dnl *********************************
dnl Evolution-Data-Server Integration
dnl *********************************
@@ -148,7 +109,7 @@ AC_ARG_ENABLE([eds-conduits],
[enable_eds="$enableval"],[enable_eds="yes"])
if test "x$enable_eds" = "xyes"; then
PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER,
- [libebook-1.2 libecal-1.2 libedataserverui-1.2])
+ [libebook-1.2 libecal-1.2 libedataserverui-3.0])
fi
AM_CONDITIONAL(ENABLE_EDS_CONDUITS, test "x$enable_eds" = "xyes")
@@ -156,16 +117,22 @@ dnl ******************************
dnl Library Checks
dnl ******************************
LIBXML_REQUIRED="libxml-2.0"
-LIBGTK_REQUIRED="gtk+-2.0 >= 2.13.0"
+LIBGTK_REQUIRED="gtk+-3.0 >= 2.99.2"
DBUS_GLIB_REQUIRED="dbus-glib-1 >= 0.74"
LIBPANELAPPLET_REQUIRED="libpanelapplet-2.0 >= 2.0.6"
GCONF_REQUIRED="gconf-2.0"
+GUDEV_REQUIRED="gudev-1.0"
+DBUS_REQUIRED="dbus-glib-1 >= 0.31"
+
+
PKG_CHECK_MODULES(GNOME_PILOT,
[
$LIBXML_REQUIRED
$LIBGTK_REQUIRED
$DBUS_GLIB_REQUIRED
+ $GUDEV_REQUIRED
+ $DBUS_REQUIRED
])
GNOME_PILOT_CFLAGS="$GNOME_PILOT_CFLAGS $PISOCK_CFLAGS"
@@ -255,6 +222,17 @@ fi
GNOME_DOC_INIT
+dnl ******************************
+dnl Special directories
+dnl ******************************
+
+dnl If you add something here, consider whether or not you also
+dnl need to add it to the .pc.in file
+
+privincludedir='${includedir}'/gnome-pilot-$BASE_VERSION
+AC_SUBST(privincludedir)
+
+
dnl Create files.
AC_CONFIG_FILES([
Makefile
@@ -269,7 +247,7 @@ capplet/Makefile
utils/Makefile
po/Makefile.in
help/Makefile
-gnome-pilot-2.0.pc
+gnome-pilot-3.0.pc
])
AC_OUTPUT
@@ -277,8 +255,6 @@ AC_MSG_NOTICE([
Configuration :
network sync : $do_network
usb : $do_usb
- LIBHAL : $with_hal
- GUDEV : $with_gudev
EDS conduits : $enable_eds
gob : $GOB
pilot-link : $PILOT_LINK_VERSION
diff --git a/gnome-pilot-2.0.pc.in b/gnome-pilot-3.0.pc.in
similarity index 64%
rename from gnome-pilot-2.0.pc.in
rename to gnome-pilot-3.0.pc.in
index b8528fd..242296e 100644
--- a/gnome-pilot-2.0.pc.in
+++ b/gnome-pilot-3.0.pc.in
@@ -2,11 +2,12 @@ prefix= prefix@
exec_prefix= exec_prefix@
libdir= libdir@
includedir= includedir@
+privincludedir= privincludedir@
gnomepilot_plversion= PILOT_LINK_VERSION@
Name: Gnome Pilot
Description:
Version: @VERSION@
-Requires: libgnome-2.0
+Requires: gtk+-3.0 >= 2.90.4 libedataserver-1.2 libebook-1.2
Libs: -L${libdir} -lgpilotd -lgpilotdcm -lgpilotdconduit @PISOCK_LIBS@
-Cflags: -I${includedir} @PISOCK_CFLAGS@
+Cflags: -I${privincludedir} @PISOCK_CFLAGS@
diff --git a/gpilotd/Makefile.am b/gpilotd/Makefile.am
index c452c0d..e64cde3 100644
--- a/gpilotd/Makefile.am
+++ b/gpilotd/Makefile.am
@@ -10,8 +10,7 @@ AM_CPPFLAGS = \
-DDEVICE_XML_DIR=\"$(datadir)/gnome-pilot\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DCONDUITDIR=\"$(datadir)\" \
- $(HAL_CFLAGS) \
- $(GUDEV_CFLAGS) \
+ -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
$(GNOME_PILOT_CFLAGS)
gpmarshal.h: gpmarshal.list
@@ -48,12 +47,12 @@ GPMARSHAL_BUILT_SRCS = \
## GOB STUFF
GOB_LIBGPILOTDCM_BUILT_SRCS = \
- ../libgpilotdCM/gnome-pilot-conduit-management.c \
- ../libgpilotdCM/gnome-pilot-conduit-management-private.h \
- ../libgpilotdCM/gnome-pilot-conduit-management.h \
- ../libgpilotdCM/gnome-pilot-conduit-config.c \
- ../libgpilotdCM/gnome-pilot-conduit-config-private.h \
- ../libgpilotdCM/gnome-pilot-conduit-config.h
+ gnome-pilot-conduit-management.c \
+ gnome-pilot-conduit-management-private.h \
+ gnome-pilot-conduit-management.h \
+ gnome-pilot-conduit-config.c \
+ gnome-pilot-conduit-config-private.h \
+ gnome-pilot-conduit-config.h
GOB_LIBGPILOTD_BUILT_SRCS = \
gnome-pilot-client.c \
@@ -94,14 +93,6 @@ gobfiles = \
$(srcdir)/gnome-pilot-conduit-standard.gob \
$(NULL)
-# ugly: gnome-pilot-conduit-config.gob and gnome-pilot-conduit-management.gob
-# used to live in libgpilotdCM/, which led to a build-order bug as they're
-# dependendent on some gpilotd/ stuff. However, third party code expects
-# the headers to be in include/libgpilotdCM so we continue to provide them there.
-../libgpilotdCM/%.c ../libgpilotdCM/%.h ../libgpilotdCM/%-private.h: %.gob
- $(MKDIR_P) ../libgpilotdCM
- $(GOB) --always-private-header -o ../libgpilotdCM -w $<
-
%.c %.h: %.gob
$(GOB) --always-private-header -w $<
@@ -125,11 +116,11 @@ MAINTAINERCLEANFILES = $(GOB_BUILT_SRCS)
libgpilotdcm_la_SOURCES = \
$(GOB_LIBGPILOTDCM_BUILT_SRCS)
-libgpilotdcmincludedir = $(includedir)/libgpilotdCM
+libgpilotdcmincludedir = $(includedir)/gnome-pilot-3.0
libgpilotdcminclude_HEADERS = \
- ../libgpilotdCM/gnome-pilot-conduit-management.h \
- ../libgpilotdCM/gnome-pilot-conduit-config.h
+ gnome-pilot-conduit-management.h \
+ gnome-pilot-conduit-config.h
libgpilotdcm_la_LIBADD = \
$(GNOME_PILOT_LIBS) \
@@ -145,7 +136,7 @@ libgpilotd_la_SOURCES = \
$(GPMARSHAL_BUILT_SRCS) \
$(NULL)
-libgpilotdincludedir = $(includedir)/gpilotd
+libgpilotdincludedir = $(includedir)/gnome-pilot-3.0
libgpilotdinclude_HEADERS = gnome-pilot-client.h
@@ -181,7 +172,7 @@ libgpilotdconduitinclude_HEADERS = \
gnome-pilot-structures.h \
$(NULL)
-libgpilotdconduitincludedir = $(includedir)/gpilotd
+libgpilotdconduitincludedir = $(includedir)/gnome-pilot-3.0
libgpilotdconduit_la_LIBADD = \
$(GNOME_PILOT_LIBS) \
@@ -194,7 +185,7 @@ libgpilotdconduit_la_LDFLAGS = \
noinst_HEADERS = gnome-pilot-conduit-backup-private.h
-gpilotincludedir = $(includedir)/gpilotd
+gpilotincludedir = $(includedir)/gnome-pilot-3.0
gpilotinclude_HEADERS = \
gpilot-daemon.h \
gnome-pilot-structures.h \
diff --git a/gpilotd/gnome-pilot-client.gob b/gpilotd/gnome-pilot-client.gob
index b9cd7ed..4956277 100644
--- a/gpilotd/gnome-pilot-client.gob
+++ b/gpilotd/gnome-pilot-client.gob
@@ -46,10 +46,9 @@
#include <glib.h>
#include <gio/gio.h>
-#include <gtk/gtkobject.h>
-#include "gpilotd/gpilot-daemon.h"
-#include "gpilotd/gpmarshal.h"
+#include <gpilot-daemon.h>
+#include <gpmarshal.h>
#define GP_DBUS_NAME "org.gnome.GnomePilot"
#define GP_DBUS_PATH "/org/gnome/GnomePilot/Daemon"
@@ -73,19 +72,19 @@ pid_t gpilotd_get_pid (void);
%}
-class Gnome:Pilot:Client from Gtk:Object {
+class Gnome:Pilot:Client from G:Object {
public DBusGConnection *connection;
public DBusGProxy *proxy;
class_init (class) {
-/* GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);*/
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
}
init (self) {
}
- public GtkObject*
+ public GObject*
new (void) {
GError *error;
GnomePilotClient *ret;
@@ -102,11 +101,12 @@ class Gnome:Pilot:Client from Gtk:Object {
return NULL;
}
- return GTK_OBJECT (ret);
+ return G_OBJECT (ret);
}
public void destroy (self) {
self->proxy = NULL;
+ g_object_unref (G_OBJECT(self));
/* FIXME: ick, what more to do here ? */
}
diff --git a/gpilotd/gnome-pilot-conduit-backup.gob b/gpilotd/gnome-pilot-conduit-backup.gob
index ff796c6..97f0e9c 100644
--- a/gpilotd/gnome-pilot-conduit-backup.gob
+++ b/gpilotd/gnome-pilot-conduit-backup.gob
@@ -50,12 +50,12 @@ class Gnome:Pilot:Conduit:Backup from Gnome:Pilot:Conduit {
self->pilot = ARG;
};
- public GtkObject*
+ public GObject*
new (GPilotPilot *pilot) {
GnomePilotConduitBackup *ret = SELF (g_object_new (TYPE_SELF,
"GnomePilotConduit::pilot", pilot,
NULL));
- return GTK_OBJECT (ret);
+ return G_OBJECT (ret);
}
/* return 0 for ok, < 0 for failure, > 0 for ok, but special case (like db not modified) */
diff --git a/gpilotd/gnome-pilot-conduit-config.gob b/gpilotd/gnome-pilot-conduit-config.gob
index 7acf8ee..55f9d84 100644
--- a/gpilotd/gnome-pilot-conduit-config.gob
+++ b/gpilotd/gnome-pilot-conduit-config.gob
@@ -24,10 +24,9 @@
%h{
#include <glib.h>
-#include <gtk/gtkobject.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-config.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
+#include <gnome-pilot-conduit.h>
+#include <gnome-pilot-config.h>
+#include <gnome-pilot-conduit-management.h>
#include <gmodule.h>
%}
@@ -35,7 +34,7 @@
#include <config.h>
%}
-class Gnome:Pilot:Conduit:Config from Gtk:Object {
+class Gnome:Pilot:Conduit:Config from G:Object {
public GnomePilotConduitSyncType sync_type;
public GnomePilotConduitSyncType first_sync_type;
public gboolean first_slow;
@@ -101,10 +100,10 @@ class Gnome:Pilot:Conduit:Config from Gtk:Object {
/* This loads a conduit of a specific type */
public GnomePilotConduitConfig*
new(GnomePilotConduitManagement *gpcm, guint32 pilot_id) {
- GtkObject *ret = NULL;
+ GObject *ret = NULL;
GnomePilotConduitConfig *obj;
- ret = GTK_OBJECT(GET_NEW);
+ ret = G_OBJECT(GET_NEW);
obj = SELF(ret);
obj->_priv->pilot_id = pilot_id;
obj->_priv->gpcm = gpcm;
@@ -115,7 +114,7 @@ class Gnome:Pilot:Conduit:Config from Gtk:Object {
/* Destroys this instance of sefl */
public void
destroy(self) {
- gtk_object_destroy(GTK_OBJECT(self));
+ g_object_unref (G_OBJECT(self));
}
/***********************************/
diff --git a/gpilotd/gnome-pilot-conduit-file.gob b/gpilotd/gnome-pilot-conduit-file.gob
index 56b7553..b70461f 100644
--- a/gpilotd/gnome-pilot-conduit-file.gob
+++ b/gpilotd/gnome-pilot-conduit-file.gob
@@ -38,12 +38,12 @@
%}
class Gnome:Pilot:Conduit:File from Gnome:Pilot:Conduit {
- public GtkObject*
+ public GObject*
new (GPilotPilot *pilot) {
GnomePilotConduitFile *ret = SELF (g_object_new (TYPE_SELF,
"GnomePilotConduit::pilot", pilot,
NULL));
- return GTK_OBJECT (ret);
+ return G_OBJECT (ret);
}
/* return 0 for ok, < 0 for failure */
diff --git a/gpilotd/gnome-pilot-conduit-management.gob b/gpilotd/gnome-pilot-conduit-management.gob
index cb397c1..efdfe96 100644
--- a/gpilotd/gnome-pilot-conduit-management.gob
+++ b/gpilotd/gnome-pilot-conduit-management.gob
@@ -39,8 +39,7 @@
#include <config.h>
#include <glib.h>
#include <glib/gi18n.h>
-#include <gtk/gtkobject.h>
-#include <gpilotd/gnome-pilot-conduit.h>
+#include <gnome-pilot-conduit.h>
#include <gmodule.h>
#ifdef DLOPEN_TEST
@@ -117,7 +116,7 @@ GHashTable *conduitid_to_datastruct;
static const gchar *gpcm_valid_tags[] = {"conduit","name",NULL};
%}
-class Gnome:Pilot:Conduit:Management from Gtk:Object {
+class Gnome:Pilot:Conduit:Management from G:Object {
/* TRUE if the module is loaded can be used for sync. */
private gboolean loaded;
@@ -175,7 +174,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
new (gchar *_name (check null), enum GnomePilotConduitFilter filter)
onerror NULL
{
- GtkObject *ret = NULL;
+ GObject *ret = NULL;
GHashTable *which_to_use = NULL;
GnomePilotConduitManagement *obj = NULL;
GnomePilotConduitMgmtData *_mgmtdata = NULL;
@@ -198,7 +197,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
_mgmtdata = g_hash_table_lookup (which_to_use,_name);
if (_mgmtdata) {
- ret = GTK_OBJECT (GET_NEW);
+ ret = G_OBJECT (GET_NEW);
obj = SELF (ret);
obj->_priv->loaded = FALSE;
obj->_priv->mgmtdata = _mgmtdata;
@@ -220,7 +219,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
if (number_of_instances==0) {
/* g_message ("No more instances"); */
}
- gtk_object_destroy (GTK_OBJECT (self));
+ g_object_unref (G_OBJECT (self));
UNLOCK_MY_COUNTER;
UNLOCK_INSTANCE;
}
diff --git a/gpilotd/gnome-pilot-conduit-standard-abs.c b/gpilotd/gnome-pilot-conduit-standard-abs.c
index 3a8e52c..d66e5ef 100644
--- a/gpilotd/gnome-pilot-conduit-standard-abs.c
+++ b/gpilotd/gnome-pilot-conduit-standard-abs.c
@@ -37,7 +37,6 @@
#include "manager.h"
-#ifdef PILOT_LINK_0_12
/* Compatibility routines for old API in pilot-link-0.11 */
extern int
gnome_pilot_compat_with_pilot_link_0_11_dlp_ReadRecordById (int sd, int fHandle, recordid_t id, void *buffer,
@@ -103,7 +102,6 @@ gnome_pilot_compat_with_pilot_link_0_11_dlp_ReadNextModifiedRec (int sd, int fHa
return result;
}
-#endif
enum {
MATCH_RECORD,
@@ -206,11 +204,11 @@ gnome_pilot_conduit_standard_abs_get_type (void)
return pilot_conduit_standard_abs_type;
}
-GtkObject *
+GObject *
gnome_pilot_conduit_standard_abs_new (char *db_name,
guint32 creator_id)
{
- GtkObject *retval;
+ GObject *retval;
retval = g_object_new (gnome_pilot_conduit_standard_abs_get_type (),
"GnomePilotConduitStandard::db_name", db_name,
@@ -223,10 +221,10 @@ gnome_pilot_conduit_standard_abs_new (char *db_name,
static void
gnome_pilot_conduit_standard_abs_class_init (GnomePilotConduitStandardAbsClass *klass)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GnomePilotConduitStandardClass *conduit_standard_class;
- object_class = (GtkObjectClass*) klass;
+ object_class = (GObjectClass*) klass;
conduit_standard_class = (GnomePilotConduitStandardClass *) klass;
parent_class = g_type_class_peek (gnome_pilot_conduit_standard_get_type ());
@@ -542,11 +540,7 @@ gnome_pilot_conduit_standard_real_copy_from_pilot (GnomePilotConduitStandard *
}
/* copy all records */
-#ifdef PILOT_LINK_0_12
while (gnome_pilot_compat_with_pilot_link_0_11_dlp_ReadRecordByIndex (dbinfo->pilot_socket,
-#else
- while (dlp_ReadRecordByIndex (dbinfo->pilot_socket,
-#endif
dbinfo->db_handle,
index,
remote.record,
@@ -711,7 +705,7 @@ gnome_pilot_conduit_standard_abs_match_record (GnomePilotConduitStandardAbs *con
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [MATCH_RECORD],
0,
local,
@@ -730,7 +724,7 @@ gnome_pilot_conduit_standard_abs_free_match (GnomePilotConduitStandardAbs *condu
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [FREE_MATCH],
0,
local,
@@ -747,7 +741,7 @@ gnome_pilot_conduit_standard_abs_archive_local (GnomePilotConduitStandardAbs *co
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [ARCHIVE_LOCAL],
0,
local,
@@ -765,7 +759,7 @@ gnome_pilot_conduit_standard_abs_archive_remote (GnomePilotConduitStandardAbs *c
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [ARCHIVE_REMOTE],
0,
local,
@@ -783,7 +777,7 @@ gnome_pilot_conduit_standard_abs_store_remote (GnomePilotConduitStandardAbs *con
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [STORE_REMOTE],
0,
remote,
@@ -801,7 +795,7 @@ gnome_pilot_conduit_standard_abs_iterate (GnomePilotConduitStandardAbs *conduit,
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [ITERATE],
0,
local,
@@ -820,7 +814,7 @@ gnome_pilot_conduit_standard_abs_iterate_specific (GnomePilotConduitStandardAbs
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [ITERATE_SPECIFIC],
0,
local,
@@ -838,7 +832,7 @@ gnome_pilot_conduit_standard_abs_purge (GnomePilotConduitStandardAbs *conduit)
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [PURGE],
0,
&retval);
@@ -855,7 +849,7 @@ gnome_pilot_conduit_standard_abs_set_status (GnomePilotConduitStandardAbs *condu
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [SET_STATUS],
0,
local,
@@ -875,7 +869,7 @@ gnome_pilot_conduit_standard_abs_set_pilot_id (GnomePilotConduitStandardAbs *con
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [SET_PILOT_ID],
0,
local,
@@ -894,7 +888,7 @@ gnome_pilot_conduit_standard_abs_compare (GnomePilotConduitStandardAbs *conduit,
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [COMPARE],
0,
local,
@@ -913,7 +907,7 @@ gnome_pilot_conduit_standard_abs_compare_backup (GnomePilotConduitStandardAbs *c
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [COMPARE_BACKUP],
0,
local,
@@ -932,7 +926,7 @@ gnome_pilot_conduit_standard_abs_free_transmit (GnomePilotConduitStandardAbs *co
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [FREE_TRANSMIT],
0,
local,
@@ -950,7 +944,7 @@ gnome_pilot_conduit_standard_abs_delete_all (GnomePilotConduitStandardAbs *condu
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [DELETE_ALL],
0,
&retval);
@@ -967,7 +961,7 @@ gnome_pilot_conduit_standard_abs_transmit (GnomePilotConduitStandardAbs *conduit
g_return_val_if_fail (conduit != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [TRANSMIT],
0,
local,
@@ -986,7 +980,7 @@ gnome_pilot_conduit_standard_abs_pre_sync (GnomePilotConduitStandardAbs *conduit
g_return_val_if_fail (dbinfo != NULL, -1);
g_return_val_if_fail (GNOME_IS_PILOT_CONDUIT_STANDARD_ABS (conduit), -1);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_standard_abs_signals [PRE_SYNC],
0,
dbinfo,
@@ -1210,11 +1204,7 @@ standard_abs_sync_record (GnomePilotConduitStandardAbs *conduit,
g_message("gpilotd: retrieve %ld from pilot",local->ID);
remote = g_new0(PilotRecord,1);
remote->record = malloc(0xffff);
-#ifdef PILOT_LINK_0_12
gnome_pilot_compat_with_pilot_link_0_11_dlp_ReadRecordById(handle,db,
-#else
- dlp_ReadRecordById(handle,db,
-#endif
local->ID,
remote->record,
&index,
@@ -1571,11 +1561,7 @@ standard_abs_merge_to_local (GnomePilotConduitStandardAbs *conduit,
retval = 0;
remote.record = buffer;
-#ifdef PILOT_LINK_0_12
while (gnome_pilot_compat_with_pilot_link_0_11_dlp_ReadRecordByIndex (handle, db,
-#else
- while (dlp_ReadRecordByIndex (handle, db,
-#endif
index,
remote.record,
&remote.ID,
@@ -1614,11 +1600,7 @@ SlowSync (int handle,
g_message("Performing Slow Synchronization");
-#ifdef PILOT_LINK_0_12
while (gnome_pilot_compat_with_pilot_link_0_11_dlp_ReadRecordByIndex (handle, db,
-#else
- while (dlp_ReadRecordByIndex (handle, db,
-#endif
index,
remote.record,
&remote.ID,
@@ -1658,11 +1640,7 @@ FastSync (int handle,
g_message("Performing Fast Synchronization");
-#ifdef PILOT_LINK_0_12
while (gnome_pilot_compat_with_pilot_link_0_11_dlp_ReadNextModifiedRec (handle, db,
-#else
- while (dlp_ReadNextModifiedRec (handle, db,
-#endif
remote.record,
&remote.ID,
&index,
diff --git a/gpilotd/gnome-pilot-conduit-standard-abs.h b/gpilotd/gnome-pilot-conduit-standard-abs.h
index 8f3a06e..1c4db68 100644
--- a/gpilotd/gnome-pilot-conduit-standard-abs.h
+++ b/gpilotd/gnome-pilot-conduit-standard-abs.h
@@ -143,7 +143,7 @@ struct _GnomePilotConduitStandardAbsClass
};
GType gnome_pilot_conduit_standard_abs_get_type (void);
-GtkObject *gnome_pilot_conduit_standard_abs_new (char *db_name,
+GObject *gnome_pilot_conduit_standard_abs_new (char *db_name,
guint32 creator_id);
gint gnome_pilot_conduit_standard_abs_match_record (GnomePilotConduitStandardAbs *conduit,
LocalRecord **local,
diff --git a/gpilotd/gnome-pilot-conduit-standard.gob b/gpilotd/gnome-pilot-conduit-standard.gob
index 488f169..a4b22d5 100644
--- a/gpilotd/gnome-pilot-conduit-standard.gob
+++ b/gpilotd/gnome-pilot-conduit-standard.gob
@@ -46,14 +46,14 @@ class Gnome:Pilot:Conduit:Standard from Gnome:Pilot:Conduit {
public gboolean slow;
argument (CONSTRUCT) BOOLEAN slow (export) link;
- public GtkObject*
+ public GObject*
new (char *db_name, guint32 creator_id, GPilotPilot *pilot) {
GnomePilotConduitStandard *ret = SELF (g_object_new (TYPE_SELF,
"GnomePilotConduit::pilot", pilot,
NULL));
self_set_creator_id (ret, creator_id);
self_set_db_name (ret, db_name);
- return GTK_OBJECT (ret);
+ return G_OBJECT (ret);
}
signal last INT (POINTER)
diff --git a/gpilotd/gnome-pilot-conduit-sync-abs.c b/gpilotd/gnome-pilot-conduit-sync-abs.c
index eef71b3..1143691 100644
--- a/gpilotd/gnome-pilot-conduit-sync-abs.c
+++ b/gpilotd/gnome-pilot-conduit-sync-abs.c
@@ -131,10 +131,10 @@ gnome_pilot_conduit_sync_abs_get_type (void)
static void
gnome_pilot_conduit_sync_abs_class_init (GnomePilotConduitSyncAbsClass *klass)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GnomePilotConduitStandardClass *conduit_standard_class;
- object_class = (GtkObjectClass*) klass;
+ object_class = (GObjectClass*) klass;
conduit_standard_class = (GnomePilotConduitStandardClass *) klass;
parent_class = g_type_class_peek (gnome_pilot_conduit_standard_get_type ());
@@ -302,7 +302,7 @@ gnome_pilot_conduit_sync_abs_init (GnomePilotConduitSyncAbs *conduit)
}
-GtkObject *
+GObject *
gnome_pilot_conduit_sync_abs_new (char *db_name,
guint32 creator_id)
{
@@ -313,7 +313,7 @@ gnome_pilot_conduit_sync_abs_new (char *db_name,
"GnomePilotConduitStandard::creator_id", creator_id,
NULL));
- return GTK_OBJECT (retval);
+ return G_OBJECT (retval);
}
/* Local utility routines */
@@ -668,7 +668,7 @@ gnome_pilot_conduit_sync_abs_pre_sync (SyncHandler *sh, int dbhandle, int *slow)
dlp_ReadOpenDBInfo (dbinfo->pilot_socket, dbinfo->db_handle, &conduit->total_records);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [PRE_SYNC],
0,
dbinfo,
@@ -689,7 +689,7 @@ gnome_pilot_conduit_sync_abs_post_sync (SyncHandler *sh, int dbhandle)
conduit = ((gp_closure *)sh->data)->conduit;
dbinfo = ((gp_closure *)sh->data)->dbinfo;
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [POST_SYNC],
0,
dbinfo,
@@ -708,7 +708,7 @@ gnome_pilot_conduit_sync_abs_set_pilot_id (SyncHandler *sh, DesktopRecord *dr, r
gdr = (GnomePilotDesktopRecord *)dr;
sync_abs_fill_gdr (gdr);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [SET_PILOT_ID],
0,
gdr, id, &retval);
@@ -729,7 +729,7 @@ gnome_pilot_conduit_sync_abs_set_status_cleared (SyncHandler *sh, DesktopRecord
gdr = (GnomePilotDesktopRecord *)dr;
sync_abs_fill_gdr (gdr);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [SET_STATUS_CLEARED],
0,
gdr, &retval);
@@ -748,7 +748,7 @@ gnome_pilot_conduit_sync_abs_for_each (SyncHandler *sh, DesktopRecord **dr)
conduit = ((gp_closure *)sh->data)->conduit;
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [FOR_EACH],
0,
&gdr, &retval);
@@ -770,7 +770,7 @@ gnome_pilot_conduit_sync_abs_for_each_modified (SyncHandler *sh, DesktopRecord *
conduit = ((gp_closure *)sh->data)->conduit;
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [FOR_EACH_MODIFIED],
0,
&gdr, &retval);
@@ -796,7 +796,7 @@ gnome_pilot_conduit_sync_abs_compare (SyncHandler *sh, PilotRecord *pr, DesktopR
gdr = (GnomePilotDesktopRecord *)dr;
sync_abs_fill_gdr (gdr);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [COMPARE],
0,
gdr, gpr, &retval);
@@ -816,7 +816,7 @@ gnome_pilot_conduit_sync_abs_add_record (SyncHandler *sh, PilotRecord *pr)
conduit = ((gp_closure *)sh->data)->conduit;
gpr = sync_abs_pr_to_gpr (pr);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [ADD_RECORD],
0,
gpr, &retval);
@@ -839,7 +839,7 @@ gnome_pilot_conduit_sync_abs_replace_record (SyncHandler *sh, DesktopRecord *dr,
sync_abs_fill_gdr (gdr);
gpr = sync_abs_pr_to_gpr (pr);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [REPLACE_RECORD],
0,
gdr, gpr, &retval);
@@ -860,7 +860,7 @@ gnome_pilot_conduit_sync_abs_delete_record (SyncHandler *sh, DesktopRecord *dr)
gdr = (GnomePilotDesktopRecord *)dr;
sync_abs_fill_gdr (gdr);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [DELETE_RECORD],
0,
gdr, &retval);
@@ -879,7 +879,7 @@ gnome_pilot_conduit_sync_abs_archive_record (SyncHandler *sh, DesktopRecord *dr,
gdr = (GnomePilotDesktopRecord *)dr;
sync_abs_fill_gdr (gdr);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [ARCHIVE_RECORD],
0,
gdr, archive ? TRUE : FALSE, &retval);
@@ -900,7 +900,7 @@ gnome_pilot_conduit_sync_abs_match (SyncHandler *sh, PilotRecord *pr, DesktopRec
conduit = ((gp_closure *)sh->data)->conduit;
gpr = sync_abs_pr_to_gpr (pr);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [MATCH],
0,
gpr, &gdr, &retval);
@@ -926,7 +926,7 @@ gnome_pilot_conduit_sync_abs_free_match (SyncHandler *sh, DesktopRecord *dr)
gdr = (GnomePilotDesktopRecord *)dr;
sync_abs_fill_gdr (gdr);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [FREE_MATCH],
0,
gdr, &retval);
@@ -947,7 +947,7 @@ gnome_pilot_conduit_sync_abs_prepare (SyncHandler *sh, DesktopRecord *dr, PilotR
sync_abs_fill_gdr (gdr);
gpr = sync_abs_pr_to_gpr (pr);
- g_signal_emit (GTK_OBJECT (conduit),
+ g_signal_emit (G_OBJECT (conduit),
pilot_conduit_sync_abs_signals [PREPARE],
0,
gdr, gpr, &retval);
diff --git a/gpilotd/gnome-pilot-conduit-sync-abs.h b/gpilotd/gnome-pilot-conduit-sync-abs.h
index f87ee12..edfc479 100644
--- a/gpilotd/gnome-pilot-conduit-sync-abs.h
+++ b/gpilotd/gnome-pilot-conduit-sync-abs.h
@@ -142,7 +142,7 @@ struct _GnomePilotConduitSyncAbsClass
};
GType gnome_pilot_conduit_sync_abs_get_type (void);
-GtkObject *gnome_pilot_conduit_sync_abs_new (char *db_name,
+GObject *gnome_pilot_conduit_sync_abs_new (char *db_name,
guint32 creator_id);
void gnome_pilot_conduit_sync_abs_set_num_local_records (GnomePilotConduitSyncAbs *conduit,
diff --git a/gpilotd/gnome-pilot-conduit.gob b/gpilotd/gnome-pilot-conduit.gob
index 4984309..c7b7ea1 100644
--- a/gpilotd/gnome-pilot-conduit.gob
+++ b/gpilotd/gnome-pilot-conduit.gob
@@ -42,7 +42,7 @@ typedef enum {
} GPC_MessageType;
%}
-class Gnome:Pilot:Conduit from Gtk:Object {
+class Gnome:Pilot:Conduit from G:Object {
public gchar *name destroywith g_free;
argument STRING (type gchar*) name (export) stringlink
@@ -61,10 +61,10 @@ class Gnome:Pilot:Conduit from Gtk:Object {
self->name = NULL;
}
- public GtkObject*
+ public GObject*
new (void) {
GnomePilotConduit *retval = GET_NEW;
- return GTK_OBJECT (retval);
+ return G_OBJECT (retval);
}
signal first NONE (INT, INT)
diff --git a/gpilotd/gnome-pilot-structures.c b/gpilotd/gnome-pilot-structures.c
index 5e8c486..afbfead 100644
--- a/gpilotd/gnome-pilot-structures.c
+++ b/gpilotd/gnome-pilot-structures.c
@@ -29,7 +29,7 @@
#include <stdio.h>
#include <string.h>
#include "gnome-pilot-structures.h"
-#include <gpilotd/gnome-pilot-config.h>
+#include <gnome-pilot-config.h>
#include "gpilot-gui.h"
#include <glib/gi18n.h>
#include <errno.h>
@@ -401,9 +401,6 @@ gpilot_irda_device_deinit (GPilotDevice *device)
static gint
gpilot_network_device_init (GPilotDevice *device)
{
-#ifndef PILOT_LINK_0_12
- struct pi_sockaddr addr;
-#endif
#define MAXLINELEN 256
char line[MAXLINELEN];
char pi_net[100];
@@ -436,24 +433,14 @@ gpilot_network_device_init (GPilotDevice *device)
strncat(pi_net, "any", 3);
}
}
-#ifdef PILOT_LINK_0_12
device->fd = pi_socket (PI_AF_PILOT, PI_SOCK_STREAM, PI_PF_DLP);
-#else
- device->fd = pi_socket (PI_AF_PILOT, PI_SOCK_STREAM, PI_PF_NET);
-#endif
if (device->fd < 0) {
g_warning ("Device [%s, %s]: Unable to get socket: %s",
device->name, pi_net, strerror(errno));
return -1;
}
-#ifdef PILOT_LINK_0_12
ret = pi_bind (device->fd, pi_net);
-#else
- strncpy (addr.pi_device,pi_net, strlen(pi_net));
-
- ret = pi_bind (device->fd, (struct sockaddr*)&addr, sizeof (addr));
-#endif
if (ret < 0) {
if (device->type == PILOT_DEVICE_BLUETOOTH) {
g_snprintf(line, MAXLINELEN,_("Bluetooth Device [%s]: Unable to "
@@ -771,7 +758,6 @@ gpilot_pilot_init (GPilotPilot *pilot,
pilot->romversion = g_key_file_get_integer (kfile, iPilot, "romversion", NULL);
pilot->number=i;
pilot->sync_options.basedir = g_key_file_get_string (kfile, iPilot, "basedir", NULL);
-#ifdef PILOT_LINK_0_12
pilot->pilot_charset = g_key_file_get_string (kfile, iPilot, "charset", NULL);
/* If no charset has been specified by user, fall back
* to the PILOT_CHARSET environment variable, if that
@@ -789,9 +775,6 @@ gpilot_pilot_init (GPilotPilot *pilot,
g_strdup (GPILOT_DEFAULT_CHARSET);
}
}
-#else
- pilot->pilot_charset=NULL;
-#endif
g_key_file_free (kfile);
g_free (iPilot);
diff --git a/gpilotd/gpilot-daemon.c b/gpilotd/gpilot-daemon.c
index 2fec11f..54b2b44 100644
--- a/gpilotd/gpilot-daemon.c
+++ b/gpilotd/gpilot-daemon.c
@@ -56,9 +56,6 @@
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-#ifdef WITH_HAL
-#include <libhal.h>
-#endif
#define GP_DBUS_NAME "org.gnome.GnomePilot"
#define GP_DBUS_PATH "/org/gnome/GnomePilot/Daemon"
@@ -92,20 +89,10 @@ static void load_devices_xml (void);
static int known_usb_device (gchar *match_str);
static gboolean sync_device (GPilotDevice *device, GPilotContext *context);
-#ifdef WITH_HAL
-static DBusConnection *dbus_connection = NULL;
-static LibHalContext *hal_ctx = NULL;
-
-static gboolean gpilotd_dbus_init (void);
-static LibHalContext *gpilotd_hal_init (void);
-#else
-# ifdef WITH_GUDEV
/* move these into GpilotDaemonPrivate... */
#include <gudev/gudev.h>
static gboolean gpilotd_gudev_init (void);
GUdevClient *gudev_client = NULL;
-# endif /* WITH_GUDEV */
-#endif /* WITH_HAL */
static guint visor_timeout_id = -1;
static guint udev_initialised = 0;
@@ -226,184 +213,6 @@ static void usb_device_added (int vendor_id, int product_id) {
}
-#ifdef WITH_HAL
-static void
-hal_device_added (LibHalContext *ctx, const char *udi)
-{
- char *bus, *platform;
- int vendor_id, product_id;
- DBusError error;
- GpilotDaemonPrivate *priv;
-
- priv = GPILOT_DAEMON (daemon_object)->priv;
-
- if (priv->gpilotd_context->paused)
- return;
-
- /* HAL match rule: we look for pda.platform == 'palm'
- * (or the legacy info.bus == 'usb_device')
- * and then try to match the usb_device.product_id and usb_device.vendor_id
- * against the list in devices.xml.
- */
- if ((platform = libhal_device_get_property_string (hal_ctx, udi, "pda.platform", NULL))) {
- if (strcmp (platform, "palm") != 0) {
- libhal_free_string (platform);
- return;
- }
- libhal_free_string (platform);
- } else if ((bus = libhal_device_get_property_string (hal_ctx, udi, "info.bus", NULL))) {
- if (strcmp (bus, "usb_device") != 0) {
- libhal_free_string (bus);
- return;
- }
- libhal_free_string (bus);
- } else {
- return;
- }
-
- dbus_error_init (&error);
- vendor_id = libhal_device_get_property_int (hal_ctx, udi,
- "usb_device.vendor_id", &error);
- if(vendor_id == -1) {
- g_warning ("Could not get usb vendor ID from hal: %s", error.message);
- return;
- }
- product_id = libhal_device_get_property_int (hal_ctx, udi,
- "usb_device.product_id", NULL);
- if(product_id == -1) {
- g_warning ("Could not get usb product ID from hal: %s", error.message);
- return;
- }
-
- usb_device_added(vendor_id, product_id);
-}
-
-static void
-hal_device_removed (LibHalContext *ctx, const char *udi)
-{
-
-}
-
-static gboolean
-reinit_dbus (gpointer user_data)
-{
- if (gpilotd_dbus_init ()) {
- if ((hal_ctx = gpilotd_hal_init ()))
- libhal_ctx_set_dbus_connection (hal_ctx, dbus_connection);
- else
- exit (1);
-
- return FALSE;
- }
-
- return TRUE;
-}
-
-static DBusHandlerResult
-gpilotd_dbus_filter_function (DBusConnection *connection, DBusMessage *message, void *user_data)
-{
- if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") &&
- strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) {
- libhal_ctx_free (hal_ctx);
- hal_ctx = NULL;
-
- dbus_connection_unref (dbus_connection);
- dbus_connection = NULL;
-
- g_timeout_add (3000, reinit_dbus, NULL);
-
- return DBUS_HANDLER_RESULT_HANDLED;
- }
-
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-static gboolean
-gpilotd_dbus_init (void)
-{
- DBusError error;
-
- if (dbus_connection != NULL)
- return TRUE;
-
- dbus_error_init (&error);
- if (!(dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
- g_warning ("could not get system bus: %s", error.message);
- dbus_error_free (&error);
- return FALSE;
- }
-
- dbus_connection_setup_with_g_main (dbus_connection, NULL);
- dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
-
- dbus_connection_add_filter (dbus_connection, gpilotd_dbus_filter_function, NULL, NULL);
-
- return TRUE;
-}
-
-static LibHalContext *
-gpilotd_hal_init (void)
-{
- LibHalContext *ctx;
- DBusError error;
- char **devices;
- int nr;
-
- if (!gpilotd_dbus_init ()) {
- g_warning ("failed to initialise DBUS!");
- return NULL;
- }
-
- if (!(ctx = libhal_ctx_new ())) {
- g_warning ("failed to create a HAL context!");
- return NULL;
- }
-
- libhal_ctx_set_dbus_connection (ctx, dbus_connection);
-
- libhal_ctx_set_device_added (ctx, hal_device_added);
- libhal_ctx_set_device_removed (ctx, hal_device_removed);
- /*libhal_ctx_set_device_new_capability (ctx, hal_device_new_capability);*/
- /*libhal_ctx_set_device_lost_capability (ctx, hal_device_lost_capability);*/
- /*libhal_ctx_set_device_property_modified (ctx, hal_property_modified);*/
- /*libhal_ctx_set_device_condition (ctx, hal_device_condition);*/
-
- dbus_error_init (&error);
- if (!libhal_device_property_watch_all (ctx, &error)) {
- g_warning ("failed to watch all HAL properties!: %s", error.message);
- dbus_error_free (&error);
- libhal_ctx_free (ctx);
- return NULL;
- }
-
- if (!libhal_ctx_init (ctx, &error)) {
- g_warning ("libhal_ctx_init failed: %s", error.message);
- dbus_error_free (&error);
- libhal_ctx_free (ctx);
- return NULL;
- }
-
- /*
- * Do something to ping the HAL daemon - the above functions will
- * succeed even if hald is not running, so long as DBUS is. But we
- * want to exit silently if hald is not running, to behave on
- * pre-2.6 systems.
- */
- if (!(devices = libhal_get_all_devices (ctx, &nr, &error))) {
- g_warning ("seems that HAL is not running: %s", error.message);
- dbus_error_free (&error);
-
- libhal_ctx_shutdown (ctx, NULL);
- libhal_ctx_free (ctx);
- return NULL;
- }
-
- libhal_free_string_array (devices);
-
- return ctx;
-}
-#else
-# ifdef WITH_GUDEV
static void gpilotd_gudev_handler (GUdevClient *client, gchar *action, GUdevDevice *device,
gpointer user_data)
{
@@ -447,8 +256,6 @@ gpilotd_gudev_init (void)
return TRUE;
}
-#endif /* WITH_GUDEV */
-#endif /* WITH_HAL */
static int
device_equal_by_io (GPilotDevice *dev, GIOChannel *io)
@@ -492,13 +299,6 @@ pilot_connect (GPilotDevice *device,int *error)
#define MAX_TIME_FOR_PI_BIND 1000000 /* 1 second, or 1,000,000 usec. */
#define SLEEP_TIME_FOR_PI_BIND 50000 /* 50 ms */
-#ifndef PILOT_LINK_0_12
- struct pi_sockaddr addr;
- union {
- struct pi_sockaddr *pi_sockaddrp;
- struct sockaddr *sockaddrp;
- } addrp;
-#endif
int sd, listen_sd, pf;
int ret;
@@ -534,7 +334,6 @@ pilot_connect (GPilotDevice *device,int *error)
* listening at this point, so move on to accept */
listen_sd = device->fd;
} else {
-#ifdef PILOT_LINK_0_12
/* pl 0.12.0 wants to autodetect the protocol, so pass DLP */
/* (at time of writing there's a buglet in pl where if you
* _do_ pass in the correct NET protocol then pl will flush
@@ -542,9 +341,6 @@ pilot_connect (GPilotDevice *device,int *error)
* packet.
*/
listen_sd = pi_socket (PI_AF_PILOT, PI_SOCK_STREAM, PI_PF_DLP);
-#else
- listen_sd = pi_socket (PI_AF_PILOT, PI_SOCK_STREAM, pf);
-#endif
if (listen_sd < 0) {
g_warning ("pi_socket returned error %d (%s)",
listen_sd,
@@ -555,8 +351,8 @@ pilot_connect (GPilotDevice *device,int *error)
/*
- * When using HAL and USB, the ttyUSB[01] device files are
- * not created until after Hal has notified gpilotd that
+ * When using DBUS and USB, the ttyUSB[01] device files are
+ * not created until after dbus has notified gpilotd that
* a file exists. This causes pi_bind to fail.
* To prevent a failure (and therefore sync), retry pi_bind
* for up to the time allotted, sleeping a little in-between
@@ -565,15 +361,7 @@ pilot_connect (GPilotDevice *device,int *error)
time_elapsed_pi_bind = 0;
do {
-#ifdef PILOT_LINK_0_12
ret = pi_bind (listen_sd, device->port);
-#else
- addr.pi_family = PI_AF_PILOT;
- strcpy (addr.pi_device,device->port);
- addrp.pi_sockaddrp = &addr;
- ret = pi_bind (listen_sd, addrp.sockaddrp,
- sizeof (addr));
-#endif
if(ret < 0) {
usleep(SLEEP_TIME_FOR_PI_BIND);
time_elapsed_pi_bind += SLEEP_TIME_FOR_PI_BIND;
@@ -615,15 +403,6 @@ pilot_connect (GPilotDevice *device,int *error)
if (error)
*error = 0;
- /* since pilot-link 0.12.0preX, the listen_sd represents
- * the accepted connection, so don't close listen_sd
- * after the accept */
-#ifndef PILOT_LINK_0_12
- if (device->type != PILOT_DEVICE_NETWORK &&
- device->type != PILOT_DEVICE_BLUETOOTH) {
- pi_close(listen_sd);
- }
-#endif
return sd;
}
@@ -696,7 +475,6 @@ match_pilot_and_majick (const GPilotPilot *pilot,
static int
check_usb_config (GPilotDevice *device)
{
-#ifdef PILOT_LINK_0_12
#define MAXLINELEN 256
char line[MAXLINELEN];
gboolean visor_loaded;
@@ -752,9 +530,6 @@ check_usb_config (GPilotDevice *device)
error = 1;
}
return error;
-#else
- return 0;
-#endif /* PILOT_LINK_0_12 */
}
@@ -1031,7 +806,6 @@ gpilot_syncing_known_pilot (GPilotPilot *pilot,
struct stat buf;
int ret;
-#ifdef PILOT_LINK_0_12
iconv_t ic;
if (pilot->pilot_charset == NULL ||
@@ -1066,7 +840,6 @@ gpilot_syncing_known_pilot (GPilotPilot *pilot,
*/
setenv("PILOT_CHARSET",
pilot->pilot_charset, 1);
-#endif
ret = stat (pilot->sync_options.basedir, &buf);
@@ -1564,7 +1337,7 @@ visor_devices_timeout (gpointer data)
#if defined(sun) && defined (__SVR4) /*for solaris */
/* On Solaris we always try to sync. This isn't
* a great solution, but does enable syncing. We
- * should use HAL on Solaris when it is working
+ * should use dbus on Solaris when it is working
* well. See bug #385444.
*/
visor_exists = TRUE;
@@ -3096,16 +2869,8 @@ gpilot_daemon_class_init (GpilotDaemonClass *klass)
static void
gpilot_daemon_init (GpilotDaemon *daemon)
{
-#ifdef WITH_HAL
- if ((hal_ctx = gpilotd_hal_init ()) != NULL)
- udev_initialised = 1; /* if 0, fall back to polling sysfs */
-#else
-# ifdef WITH_GUDEV
gpilotd_gudev_init();
udev_initialised = 1;
-# endif
-#endif
-
daemon->priv = GPILOT_DAEMON_GET_PRIVATE (daemon);
diff --git a/libgpilotdCM/OChangeLog b/gpilotd/libgpilotdCM-OChangeLog
similarity index 96%
rename from libgpilotdCM/OChangeLog
rename to gpilotd/libgpilotdCM-OChangeLog
index 0281c5a..414a782 100644
--- a/libgpilotdCM/OChangeLog
+++ b/gpilotd/libgpilotdCM-OChangeLog
@@ -1,3 +1,6 @@
+2011-01-29
+ This file was previously in libgpilotdCM/ until that directory was removed.
+
PLEASE USE TOPLEVEL CHANGELOG
eskil - March 22 2001
diff --git a/gpilotd/manager.c b/gpilotd/manager.c
index 53bcd27..bdfbc86 100644
--- a/gpilotd/manager.c
+++ b/gpilotd/manager.c
@@ -46,8 +46,8 @@
#include "gpilot-gui.h"
#include "gnome-pilot-config.h"
-#include "../libgpilotdCM/gnome-pilot-conduit-management.h"
-#include "../libgpilotdCM/gnome-pilot-conduit-config.h"
+#include "gnome-pilot-conduit-management.h"
+#include "gnome-pilot-conduit-config.h"
#define GPCM_LABEL "conduit_mgmt"
#define GPCC_LABEL "conduit_cfg"
@@ -248,9 +248,9 @@ set_callbacks (gboolean set, GnomePilotConduit *conduit, gchar *pilot_name)
__FILE__,__LINE__);
}
- g_signal_handler_disconnect (GTK_OBJECT (conduit), progress_h);
- g_signal_handler_disconnect (GTK_OBJECT (conduit), error_h);
- g_signal_handler_disconnect (GTK_OBJECT (conduit), message_h);
+ g_signal_handler_disconnect (G_OBJECT (conduit), progress_h);
+ g_signal_handler_disconnect (G_OBJECT (conduit), error_h);
+ g_signal_handler_disconnect (G_OBJECT (conduit), message_h);
progress_h = 0;
error_h = 0;
message_h = 0;
@@ -307,17 +307,11 @@ iterate_dbs (gint pfd,
while (1) {
GnomePilotDBInfo *dbinfo;
-#ifdef PILOT_LINK_0_12
pi_buffer_t *pi_buf;
-#endif
dbinfo = g_new0 (GnomePilotDBInfo, 1);
-#ifdef PILOT_LINK_0_12
pi_buf = pi_buffer_new (sizeof (struct DBInfo));
result = dlp_ReadDBList (pfd, 0, dlpDBListRAM, index, pi_buf);
-#else
- result = dlp_ReadDBList (pfd, 0, dlpDBListRAM, index, PI_DBINFO (dbinfo));
-#endif
/* load next dbinfo block */
if (result < 0) {
/* is <0, there are no more databases, break
@@ -326,10 +320,8 @@ iterate_dbs (gint pfd,
break;
}
-#ifdef PILOT_LINK_0_12
memcpy (dbinfo, pi_buf->data, sizeof (struct DBInfo));
pi_buffer_free (pi_buf);
-#endif
index = PI_DBINFO (dbinfo)->index + 1;
dbs = g_list_append (dbs, dbinfo);
diff --git a/utils/gpilotd-client.c b/utils/gpilotd-client.c
index 36ae558..77b96a1 100644
--- a/utils/gpilotd-client.c
+++ b/utils/gpilotd-client.c
@@ -7,7 +7,7 @@
#include <glib/gi18n.h>
-#include <gpilotd/gnome-pilot-client.h>
+#include <gnome-pilot-client.h>
GnomePilotClient *gpc;
diff --git a/utils/gpilotdcm-client.c b/utils/gpilotdcm-client.c
index 46533ad..3b187e3 100644
--- a/utils/gpilotdcm-client.c
+++ b/utils/gpilotdcm-client.c
@@ -7,8 +7,8 @@
#include <glib/gi18n.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
+#include <gnome-pilot-conduit-management.h>
+#include <gnome-pilot-conduit-config.h>
int arg_listconduits,
arg_listconduitsstate,
diff --git a/utils/make-password.c b/utils/make-password.c
index 8d136d8..0db068f 100644
--- a/utils/make-password.c
+++ b/utils/make-password.c
@@ -35,9 +35,6 @@ int main(int argc,char *argv[]) {
int sd,ret;
struct PilotUser U;
char salt[3];
-#ifndef PILOT_LINK_0_12
-struct pi_sockaddr addr;
-#endif
if (argc < 2) {
fprintf(stderr,"usage:%s\n",argv[0]);
@@ -48,13 +45,7 @@ struct pi_sockaddr addr;
exit(1);
}
-#ifdef PILOT_LINK_0_12
ret = pi_bind(sd, argv[1]);
-#else
- addr.pi_family = PI_AF_PILOT;
- strcpy(addr.pi_device,argv[1]);
- ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr));
-#endif
if(ret < 0) {
perror("pi_bind");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
