[gnome-pilot] Further removal of deprecated symbols. Fix some compiler warnings.
- From: Matthew Charles Davey <mcdavey src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-pilot] Further removal of deprecated symbols. Fix some compiler warnings.
- Date: Mon, 9 Aug 2010 08:10:35 +0000 (UTC)
commit 7ddc4bff896ba6cd49250105e4d4d94eb56ad0ed
Author: Matt Davey <mcdavey mrao cam ac uk>
Date: Sun Aug 8 14:02:37 2010 +0100
Further removal of deprecated symbols. Fix some compiler warnings.
2010-08-07 Matt Davey <mcdavey mrao cam ac uk>
* #594214: Remove GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST,
GTK_CHECK_CLASS_TYPE, GTK_CHECK_TYPE, GtkClassInitFunc,
GtkObjectInitFunc, GtkTypeInfo, gdk_window_get_colormap,
gtk_about_dialog_set_name, gtk_entry_new_with_max_length,
gtk_menu_append, gtk_object_get_data, gtk_object_new,
gtk_object_ref, gtk_object_set, gtk_object_set_data,
gtk_object_sink, gtk_object_unref,
gtk_option_menu_get_menu, gtk_option_menu_set_history,
gtk_option_menu_set_menu, gtk_progress_configure,
gtk_progress_set_format_string, gtk_rc_style_unref,
gtk_toggle_button_set_state, gtk_tooltips_new,
gtk_tooltips_set_tip.
* applet/pilot.c: migrate from GtkProgress to GtkProgressBar.
* applet/gpilot-applet-progress.gob: ditto.
* backup_conduit.c: fix some printf type warnings.
* gpilotd/gnome-pilot-client.gob: use a timeout for Noop, so applet
doesn't wait ages before getting a CONNECTED signal.
* Makefile.am: remove reference to idl/OChangelog
* po/POTFILES.in: update file list in line with dbus branch changes
* .gitignore: ignore po/gnome-pilot.pot
.gitignore | 1 +
ChangeLog | 27 ++++++++--
Makefile.am | 1 -
applet/gpilot-applet-progress.gob | 28 ++++------
applet/pilot.c | 98 ++++++++++++++++-------------------
capplet/gnome-pilot-assistant.c | 28 +++++-----
capplet/gnome-pilot-cdialog.c | 2 +-
capplet/gnome-pilot-ddialog.c | 20 ++++----
capplet/gnome-pilot-pdialog.c | 12 ++--
capplet/util.c | 37 ++++++++------
conduits/backup/backup_conduit.c | 20 ++++----
conduits/file/gpilot_install_file.c | 5 +-
gpilotd/gnome-pilot-client.gob | 3 +-
po/POTFILES.in | 8 ++-
14 files changed, 150 insertions(+), 140 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17a43c7..71771f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ macros/lt~obsolete.m4
missing
mkinstalldirs
po/.intltool-merge-cache
+po/gnome-pilot.pot
po/POTFILES
stamp-h1
gnome-pilot-2.0.pc
diff --git a/ChangeLog b/ChangeLog
index 38052f4..b533fe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,30 @@
2010-08-07 Matt Davey <mcdavey mrao cam ac uk>
- * #619315 Thanks to Matthew Barnes. Handle new Evolution
- directory locations in evo >= 2.31.6.
- * #594214: Remove GtkType, gtk_type_unique, gtk_type_class,
- gtk_type_new, GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST,
+ * #594214: Remove GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST,
GTK_CHECK_CLASS_TYPE, GTK_CHECK_TYPE, GtkClassInitFunc,
GtkObjectInitFunc, GtkTypeInfo, gdk_window_get_colormap,
gtk_about_dialog_set_name, gtk_entry_new_with_max_length,
gtk_menu_append, gtk_object_get_data, gtk_object_new,
- gtk_object_ref, gtk_object_set
+ gtk_object_ref, gtk_object_set, gtk_object_set_data,
+ gtk_object_sink, gtk_object_unref,
+ gtk_option_menu_get_menu, gtk_option_menu_set_history,
+ gtk_option_menu_set_menu, gtk_progress_configure,
+ gtk_progress_set_format_string, gtk_rc_style_unref,
+ gtk_toggle_button_set_state, gtk_tooltips_new,
+ gtk_tooltips_set_tip.
+ * applet/pilot.c: migrate from GtkProgress to GtkProgressBar.
+ * applet/gpilot-applet-progress.gob: ditto.
+ * backup_conduit.c: fix some printf type warnings.
+ * gpilotd/gnome-pilot-client.gob: use a timeout for Noop, so applet
+ doesn't wait ages before getting a CONNECTED signal.
+ * Makefile.am: remove reference to idl/OChangelog
+ * po/POTFILES.in: update file list in line with dbus branch changes
+ * .gitignore: ignore po/gnome-pilot.pot
+
+2010-08-07 Matt Davey <mcdavey mrao cam ac uk>
+ * #619315 Thanks to Matthew Barnes. Handle new Evolution
+ directory locations in evo >= 2.31.6.
+ * #594214: Remove GtkType, gtk_type_unique, gtk_type_class,
+ gtk_type_new
* gnome-pilot-assistant.c: fix some printf type warnings.
* gpilot-daemon.c: ditto.
diff --git a/Makefile.am b/Makefile.am
index 33cb49f..538a8c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,6 @@ changelogs = \
conduits/OChangeLog \
conduits/file/OChangeLog \
gpilotd/OChangeLog \
- idl/OChangeLog \
libgpilotdCM/OChangeLog \
utils/OChangeLog
diff --git a/applet/gpilot-applet-progress.gob b/applet/gpilot-applet-progress.gob
index cff33d1..9b6b482 100644
--- a/applet/gpilot-applet-progress.gob
+++ b/applet/gpilot-applet-progress.gob
@@ -15,8 +15,8 @@ static gboolean timeout (GPilotAppletProgress *obj);
%}
class GPilot:Applet:Progress from Gtk:Object {
- public GtkProgress *progress;
- argument POINTER (type GtkProgress*) progress (export) link;
+ public GtkProgressBar *progress;
+ argument POINTER (type GtkProgressBar*) progress (export) link;
public gboolean alive;
argument BOOLEAN (type gboolean) alive (export) link;
@@ -37,9 +37,11 @@ class GPilot:Applet:Progress from Gtk:Object {
start (self) {
g_assert (self->progress);
if (!self->alive) {
- gtk_progress_set_activity_mode (self->progress, TRUE);
+ gtk_progress_bar_set_pulse_step (self->progress, 0.05);
+ gtk_progress_bar_pulse (self->progress);
self->alive = TRUE;
- self->_priv->timeout_handler = gtk_timeout_add (10, (GtkFunction) timeout, self);
+ self->_priv->timeout_handler = g_timeout_add (
+ 100, (GSourceFunc) timeout, self);
}
}
@@ -47,8 +49,9 @@ class GPilot:Applet:Progress from Gtk:Object {
stop (self) {
g_assert (self->progress);
if (self->alive) {
- gtk_progress_set_activity_mode (self->progress, FALSE);
+ gtk_progress_bar_set_fraction (self->progress, 1.0);
self->alive = FALSE;
+ g_source_remove(self->_priv->timeout_handler);
}
}
@@ -58,17 +61,10 @@ class GPilot:Applet:Progress from Gtk:Object {
static gboolean
timeout (GPilotAppletProgress *obj) {
- static int val = 0;
- GtkProgress *progress = gpilot_applet_progress_get_progress (obj);
- gtk_progress_set_value (progress, val);
- val += 10;
- if (val > 100) {
- val = 0;
- }
-/*
- g_message ("applet progress timeout: val = %d, res = %s",
- val, gpilot_applet_progress_get_alive (obj) ? "TRUE" : "FALSE");
-*/
+
+ GtkProgressBar *progress = gpilot_applet_progress_get_progress (obj);
+ gtk_progress_bar_pulse(progress);
+
return gpilot_applet_progress_get_alive (obj);
}
diff --git a/applet/pilot.c b/applet/pilot.c
index 824d369..76aa360 100644
--- a/applet/pilot.c
+++ b/applet/pilot.c
@@ -71,7 +71,6 @@ char *pixmaps[] =
typedef struct {
PanelApplet *applet;
- GtkTooltips *tooltips;
pilot_properties properties; /* = { NULL }; */
state curstate;
GtkWidget *image;
@@ -151,8 +150,7 @@ gpilotd_connect_cb (GnomePilotClient *client,
GError *error = NULL;
PilotApplet *applet = PILOT_APPLET (user_data);
- gtk_tooltips_set_tip (applet->tooltips, GTK_WIDGET(applet->applet),
- ("Synchronizing..."), NULL);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(applet->applet), _("Synchronizing..."));
if (!GTK_WIDGET_REALIZED (applet->image)) {
g_warning ("! realized");
@@ -190,12 +188,13 @@ gpilotd_connect_cb (GnomePilotClient *client,
g_free (buf);
gtk_widget_show_all (applet->progressDialog);
- gtk_progress_set_format_string (GTK_PROGRESS (applet->overall_progress_bar), _("Database %v of %u"));
- gtk_progress_set_format_string (GTK_PROGRESS (applet->conduit_progress_bar), "");
- gtk_progress_configure (GTK_PROGRESS (applet->overall_progress_bar),0 ,0, 1);
- gtk_progress_configure (GTK_PROGRESS (applet->conduit_progress_bar),0 ,0, 100.0);
+ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (applet->overall_progress_bar), _("Connecting..."));
+ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (applet->conduit_progress_bar), "");
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (applet->overall_progress_bar),0);
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (applet->conduit_progress_bar),0);
- gpilot_applet_progress_set_progress (applet->c_progress, GTK_PROGRESS (applet->conduit_progress_bar));
+ gpilot_applet_progress_set_progress (applet->c_progress, GTK_PROGRESS_BAR (
+ applet->conduit_progress_bar));
gpilot_applet_progress_start (applet->c_progress);
colormap = gdk_drawable_get_colormap (applet->message_area->window);
@@ -209,8 +208,7 @@ gpilotd_disconnect_cb (GnomePilotClient *client,
gpointer user_data)
{
PilotApplet *applet = PILOT_APPLET (user_data);
- gtk_tooltips_set_tip (applet->tooltips, GTK_WIDGET(applet->applet),
- ("Ready to synchronize"), NULL);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(applet->applet), _("Ready to synchronize"));
applet->curstate = WAITING;
g_message ("state = READY");
@@ -237,7 +235,7 @@ applet_back_change (PanelApplet *a,
gtk_widget_set_style (GTK_WIDGET (applet->applet), NULL);
rc_style = gtk_rc_style_new ();
gtk_widget_modify_style (GTK_WIDGET (applet->applet), rc_style);
- gtk_rc_style_unref (rc_style);
+ g_object_unref (rc_style);
switch (type) {
case PANEL_COLOR_BACKGROUND:
@@ -315,7 +313,7 @@ gpilotd_conduit_start (GnomePilotClient* client,
if (applet->properties.popups && applet->progressDialog!=NULL) {
gchar *txt=g_strdup_printf (_("%s Synchronizing : %s"),id, conduit);
gtk_label_set_text (GTK_LABEL (applet->sync_label),txt);
- gtk_progress_configure (GTK_PROGRESS (applet->conduit_progress_bar), 0, 0, 100);
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (applet->conduit_progress_bar), 0);
gpilot_applet_progress_start (applet->c_progress);
g_free (txt);
txt=g_strdup_printf (_("%s: Started\n"),conduit);
@@ -334,14 +332,14 @@ gpilotd_conduit_end (GnomePilotClient* client,
PilotApplet *applet = PILOT_APPLET (user_data);
if (applet->properties.popups && applet->progressDialog!=NULL) {
gchar *txt=g_strdup_printf (_("%s Finished : %s"),id, conduit);
- gtk_progress_configure (GTK_PROGRESS (applet->conduit_progress_bar),100,0,100);
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (applet->conduit_progress_bar),1.0);
gpilot_applet_progress_start (applet->c_progress);
gtk_label_set_text (GTK_LABEL (applet->sync_label),txt);
g_free (txt);
txt=g_strdup_printf (_("%s: Ended\n"),conduit);
gtk_text_buffer_insert_at_cursor (applet->message_buffer,txt,-1);
g_free (txt);
- gtk_progress_set_format_string (GTK_PROGRESS (applet->conduit_progress_bar), "");
+ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (applet->conduit_progress_bar), "");
gpilotd_scroll_to_insert_mark(applet);
}
}
@@ -355,16 +353,17 @@ gpilotd_conduit_progress (GnomePilotClient* client,
gpointer user_data)
{
PilotApplet *applet = PILOT_APPLET (user_data);
- gfloat tot_f,cur_f;
- tot_f = total;
- cur_f = current;
+ gdouble cur_f = (gdouble)current/(gdouble)total;
+ gchar *buf = NULL;
/*
g_message ("%s : %s : %d/%d = %d%%",id, conduit, current,
total,abs (cur_f/(tot_f/100)));
*/
if (applet->properties.popups && applet->progressDialog!=NULL) {
- gtk_progress_configure (GTK_PROGRESS (applet->conduit_progress_bar), cur_f, 1, tot_f);
- gtk_progress_set_format_string (GTK_PROGRESS (applet->conduit_progress_bar), _("%v of %u records"));
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (applet->conduit_progress_bar), cur_f);
+ buf = g_strdup_printf (_("%d of %d records"), current, total);
+ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (applet->conduit_progress_bar), buf);
+ g_free (buf);
gpilot_applet_progress_stop (applet->c_progress);
}
g_main_context_iteration (NULL, FALSE);
@@ -379,13 +378,12 @@ gpilotd_overall_progress (GnomePilotClient* client,
{
PilotApplet *applet = PILOT_APPLET (user_data);
- gfloat tot_f,cur_f;
- tot_f = total;
- cur_f = current;
-
+ gdouble cur_f = (gdouble)current/(gdouble)total;
if (applet->properties.popups && applet->progressDialog!=NULL) {
- gtk_progress_configure (GTK_PROGRESS (applet->overall_progress_bar),cur_f,0,tot_f);
+ gchar *buf=g_strdup_printf (_("Database %d of %d"), current, total);
+ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (applet->overall_progress_bar), buf);
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (applet->overall_progress_bar),cur_f);
}
g_main_context_iteration (NULL, FALSE);
}
@@ -448,7 +446,9 @@ handle_client_error (PilotApplet *self)
} else {
self->curstate=INITIALISING;
g_message ("state = INITIALISING");
- gtk_tooltips_set_tip (self->tooltips, GTK_WIDGET (self->applet),_("Not connected. Please restart daemon."), NULL);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(self->applet),
+ _("Not connected. Please restart daemon."));
+
pilot_draw (self);
show_dialog (self, GTK_MESSAGE_ERROR,
_("Not connected to gpilotd.\nPlease restart daemon."));
@@ -550,7 +550,7 @@ properties_cb (BonoboUIComponent *uic, gpointer user_data, const gchar *verbname
button = get_widget (ui,"notices_button");
- gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), self->properties.popups);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), self->properties.popups);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (toggle_notices_cb),
self);
@@ -816,9 +816,9 @@ restart_cb (BonoboUIComponent *uic, gpointer user_data, const gchar *verbname)
g_message ("state = INITIALISING");
gnome_pilot_client_restart_daemon (applet->gpc);
- gtk_tooltips_set_tip (applet->tooltips, GTK_WIDGET (applet->applet),
- _("Trying to connect to the GnomePilot Daemon"), NULL);
- applet->timeout_handler_id = gtk_timeout_add (1000,(GtkFunction)timeout,applet);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(applet->applet),
+ _("Trying to connect to the GnomePilot Daemon"));
+ applet->timeout_handler_id = g_timeout_add (1000,(GSourceFunc)timeout,applet);
return;
}
@@ -902,7 +902,8 @@ gpilotd_daemon_pause (GnomePilotClient *client,
if (on_off) {
if (applet->curstate == WAITING) {
applet->curstate = PAUSED;
- gtk_tooltips_set_tip (applet->tooltips, GTK_WIDGET (applet->applet),_("Daemon paused..."), NULL);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(applet->applet),
+ _("Daemon paused..."));
g_message ("state = PAUSED");
}
else
@@ -910,7 +911,8 @@ gpilotd_daemon_pause (GnomePilotClient *client,
}
else {
applet->curstate = WAITING;
- gtk_tooltips_set_tip (applet->tooltips, GTK_WIDGET (applet->applet), _("Ready to synchronize"), NULL);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(applet->applet),
+ _("Ready to synchronize"));
g_message ("state = READY");
}
@@ -1041,10 +1043,8 @@ timeout (PilotApplet *self)
self->properties.pilot_ids = get_pilot_ids_from_gpilotd (self);
if (self->properties.pilot_ids==NULL){
- gtk_tooltips_set_tip (self->tooltips,
- GTK_WIDGET(self->applet),
- _("Not connected. Restart daemon to reconnect"),
- NULL);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(self->applet),
+ _("Not connected. Restart daemon to reconnect"));
if (self->druid_already_launched == FALSE) {
self->druid_already_launched = TRUE;
pilot_execute_program (self, GPILOTD_DRUID);
@@ -1055,10 +1055,8 @@ timeout (PilotApplet *self)
pilot_draw (self);
/* FIXME: add gpilot_monitor_state_change () */
} else {
- gtk_tooltips_set_tip (self->tooltips,
- GTK_WIDGET (self->applet),
- _("Ready to synchronize"),
- NULL);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(self->applet),
+ _("Ready to synchronize"));
self->curstate = WAITING;
g_message ("state = READY");
@@ -1146,7 +1144,7 @@ activate_pilot_menu (GtkComboBox *widget, gpointer data)
gtk_combo_box_get_active_iter(widget, &iter);
gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, 0, &label, -1);
- gtk_object_set_data (GTK_OBJECT (applet->chooseDialog), "pilot", (gpointer)label);
+ g_object_set_data (G_OBJECT (applet->chooseDialog), "pilot", (gpointer)label);
}
static gchar*
@@ -1169,7 +1167,7 @@ pick_pilot (PilotApplet *self)
ui = load_ui (self->ui_file,"ChoosePilot");
self->chooseDialog = get_widget (ui,"ChoosePilot");
combo = get_widget (ui, "pilot_combo");
- gtk_object_set_data (GTK_OBJECT (self->chooseDialog),"pilot_combo", combo);
+ g_object_set_data (G_OBJECT (self->chooseDialog),"pilot_combo", combo);
} else {
@@ -1197,7 +1195,7 @@ pick_pilot (PilotApplet *self)
self);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
- gtk_object_set_data (GTK_OBJECT (self->chooseDialog),"pilot",self->properties.pilot_ids->data);
+ g_object_set_data (G_OBJECT (self->chooseDialog),"pilot",self->properties.pilot_ids->data);
if (gtk_dialog_run(GTK_DIALOG (self->chooseDialog))== 0) {
pilot=(gchar *)g_object_get_data (G_OBJECT (self->chooseDialog),"pilot");
} else {
@@ -1363,7 +1361,7 @@ applet_destroy (GtkWidget *applet, PilotApplet *self)
{
g_message (_("destroy gpilot-applet"));
- gtk_timeout_remove(self->timeout_handler_id);
+ g_source_remove(self->timeout_handler_id);
/* XXX free other stuff */
g_free (self);
@@ -1372,21 +1370,13 @@ applet_destroy (GtkWidget *applet, PilotApplet *self)
static void
create_pilot_widgets (GtkWidget *widget, PilotApplet *self)
{
- GtkStyle *style;
-
static GtkTargetEntry drop_types [] = {
{ "text/uri-list", 0, TARGET_URI_LIST },
};
static gint n_drop_types = sizeof (drop_types) / sizeof (drop_types[0]);
- style = gtk_widget_get_style (widget);
-
- self->tooltips = gtk_tooltips_new ();
-
- gtk_tooltips_set_tip (GTK_TOOLTIPS (self->tooltips), widget,
- _("Trying to connect to "
- "the GnomePilot Daemon"),
- NULL);
+ gtk_widget_set_tooltip_text(widget,
+ _("Trying to connect to the GnomePilot Daemon"));
self->c_progress = GPILOT_APPLET_PROGRESS (gpilot_applet_progress_new ());
@@ -1407,7 +1397,7 @@ create_pilot_widgets (GtkWidget *widget, PilotApplet *self)
gtk_container_add (GTK_CONTAINER (widget), self->image);
- self->timeout_handler_id = gtk_timeout_add (1000,(GtkFunction)timeout,self);
+ self->timeout_handler_id = g_timeout_add (1000,(GSourceFunc)timeout,self);
gtk_signal_connect (GTK_OBJECT (widget),"destroy",
GTK_SIGNAL_FUNC (applet_destroy),self);
diff --git a/capplet/gnome-pilot-assistant.c b/capplet/gnome-pilot-assistant.c
index a8aa5d3..7865535 100644
--- a/capplet/gnome-pilot-assistant.c
+++ b/capplet/gnome-pilot-assistant.c
@@ -373,21 +373,21 @@ map_widgets (GnomePilotAssistant *gpd)
priv = gpd->priv;
- gtk_object_set_data (GTK_OBJECT (gpd), "port_entry", priv->device_port);
- gtk_object_set_data (GTK_OBJECT (gpd), "name_entry", priv->device_name);
- gtk_object_set_data (GTK_OBJECT (gpd), "speed_combo", priv->device_speed);
- gtk_object_set_data (GTK_OBJECT (gpd), "timeout_spinner", priv->device_timeout);
- gtk_object_set_data (GTK_OBJECT (gpd), "usb_radio", priv->device_usb);
- gtk_object_set_data (GTK_OBJECT (gpd), "irda_radio", priv->device_irda);
- gtk_object_set_data (GTK_OBJECT (gpd), "network_radio", priv->device_network);
- gtk_object_set_data (GTK_OBJECT (gpd), "bluetooth_radio", priv->device_bluetooth);
-
- gtk_object_set_data (GTK_OBJECT (gpd), "username", priv->pilot_username);
- gtk_object_set_data (GTK_OBJECT (gpd), "pilotid", priv->pilot_id);
- gtk_object_set_data (GTK_OBJECT (gpd), "pilotname", priv->pilot_name);
- gtk_object_set_data (GTK_OBJECT (gpd), "basedir", priv->pilot_basedir);
+ g_object_set_data (G_OBJECT (gpd), "port_entry", priv->device_port);
+ g_object_set_data (G_OBJECT (gpd), "name_entry", priv->device_name);
+ g_object_set_data (G_OBJECT (gpd), "speed_combo", priv->device_speed);
+ g_object_set_data (G_OBJECT (gpd), "timeout_spinner", priv->device_timeout);
+ g_object_set_data (G_OBJECT (gpd), "usb_radio", priv->device_usb);
+ g_object_set_data (G_OBJECT (gpd), "irda_radio", priv->device_irda);
+ g_object_set_data (G_OBJECT (gpd), "network_radio", priv->device_network);
+ g_object_set_data (G_OBJECT (gpd), "bluetooth_radio", priv->device_bluetooth);
+
+ g_object_set_data (G_OBJECT (gpd), "username", priv->pilot_username);
+ 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
- gtk_object_set_data (GTK_OBJECT (gpd), "charset", priv->pilot_charset);
+ g_object_set_data (G_OBJECT (gpd), "charset", priv->pilot_charset);
#endif
}
diff --git a/capplet/gnome-pilot-cdialog.c b/capplet/gnome-pilot-cdialog.c
index 003aa65..31b5c67 100644
--- a/capplet/gnome-pilot-cdialog.c
+++ b/capplet/gnome-pilot-cdialog.c
@@ -289,7 +289,7 @@ gpcd_destroy (GtkObject *object)
priv = gpcd->priv;
- gtk_object_unref (GTK_OBJECT (priv->ui));
+ 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-ddialog.c b/capplet/gnome-pilot-ddialog.c
index e169c66..092c66f 100644
--- a/capplet/gnome-pilot-ddialog.c
+++ b/capplet/gnome-pilot-ddialog.c
@@ -236,15 +236,15 @@ map_widgets (GnomePilotDDialog *gpdd)
priv = gpdd->priv;
- gtk_object_set_data (GTK_OBJECT (gpdd), "port_entry", priv->device_port);
- gtk_object_set_data (GTK_OBJECT (gpdd), "name_entry", priv->device_name);
- gtk_object_set_data (GTK_OBJECT (gpdd), "speed_combo", priv->device_speed_combo);
- gtk_object_set_data (GTK_OBJECT (gpdd), "irda_radio", priv->device_serial);
- gtk_object_set_data (GTK_OBJECT (gpdd), "usb_radio", priv->device_usb);
- gtk_object_set_data (GTK_OBJECT (gpdd), "irda_radio", priv->device_irda);
- gtk_object_set_data (GTK_OBJECT (gpdd), "network_radio", priv->device_network);
- gtk_object_set_data (GTK_OBJECT (gpdd), "bluetooth_radio", priv->device_bluetooth);
- gtk_object_set_data (GTK_OBJECT (gpdd), "timeout_spinner", priv->device_timeout);
+ g_object_set_data (G_OBJECT (gpdd), "port_entry", priv->device_port);
+ g_object_set_data (G_OBJECT (gpdd), "name_entry", priv->device_name);
+ g_object_set_data (G_OBJECT (gpdd), "speed_combo", priv->device_speed_combo);
+ g_object_set_data (G_OBJECT (gpdd), "irda_radio", priv->device_serial);
+ g_object_set_data (G_OBJECT (gpdd), "usb_radio", priv->device_usb);
+ g_object_set_data (G_OBJECT (gpdd), "irda_radio", priv->device_irda);
+ g_object_set_data (G_OBJECT (gpdd), "network_radio", priv->device_network);
+ g_object_set_data (G_OBJECT (gpdd), "bluetooth_radio", priv->device_bluetooth);
+ g_object_set_data (G_OBJECT (gpdd), "timeout_spinner", priv->device_timeout);
}
static void
@@ -334,7 +334,7 @@ gpdd_destroy (GtkObject *object)
priv = gpdd->priv;
gtk_widget_destroy (priv->dialog);
- gtk_object_unref (GTK_OBJECT (priv->ui));
+ 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-pdialog.c b/capplet/gnome-pilot-pdialog.c
index 0e3b94c..5ee0ff7 100644
--- a/capplet/gnome-pilot-pdialog.c
+++ b/capplet/gnome-pilot-pdialog.c
@@ -265,12 +265,12 @@ map_widgets (GnomePilotPDialog *gppd)
priv = gppd->priv;
- gtk_object_set_data (GTK_OBJECT (gppd), "username", priv->pilot_username);
- gtk_object_set_data (GTK_OBJECT (gppd), "pilotid", priv->pilot_id);
- gtk_object_set_data (GTK_OBJECT (gppd), "pilotname", priv->pilot_name);
- gtk_object_set_data (GTK_OBJECT (gppd), "basedir", priv->pilot_basedir);
+ g_object_set_data (G_OBJECT (gppd), "username", priv->pilot_username);
+ 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
- gtk_object_set_data (GTK_OBJECT (gppd), "charset", priv->pilot_charset);
+ g_object_set_data (G_OBJECT (gppd), "charset", priv->pilot_charset);
#endif
}
@@ -551,7 +551,7 @@ gppd_destroy (GtkObject *object)
priv = gppd->priv;
gtk_widget_destroy (priv->dialog);
- gtk_object_unref (GTK_OBJECT (priv->ui));
+ g_object_unref (G_OBJECT (priv->ui));
gtk_signal_disconnect_by_data (GTK_OBJECT (priv->gpc), object);
diff --git a/capplet/util.c b/capplet/util.c
index 8aae72d..69bb966 100644
--- a/capplet/util.c
+++ b/capplet/util.c
@@ -257,42 +257,47 @@ real_choose_pilot_dialog (PilotState *state)
{
GtkBuilder *ui;
GtkWidget *dlg;
- GtkWidget *option_menu, *menu_item, *menu;
+ GtkWidget *device_combo;
GList *tmp;
+ GtkListStore *list_store;
+ GtkCellRenderer *renderer;
GPilotDevice *dev;
+ guint index;
gchar *objects[] = {"ChooseDevice", NULL};
ui = gtk_builder_new ();
gtk_builder_add_objects_from_file (ui, UIDATADIR "/gpilotd-capplet.ui", objects, NULL);
dlg = GTK_WIDGET (gtk_builder_get_object (ui,"ChooseDevice"));
- option_menu = GTK_WIDGET (gtk_builder_get_object (ui, "device_menu"));
+ device_combo = GTK_WIDGET (gtk_builder_get_object (ui, "device_combo"));
- gtk_object_set_data (GTK_OBJECT (dlg), "device_menu", option_menu);
-
- menu = gtk_menu_new ();
+ g_object_set_data (G_OBJECT (dlg), "device_combo", device_combo);
+
+ list_store = gtk_list_store_new (1, G_TYPE_STRING);
+ gtk_combo_box_set_model (GTK_COMBO_BOX (device_combo), GTK_TREE_MODEL (list_store));
+ renderer = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (device_combo), renderer, TRUE);
+ gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (device_combo), renderer, "text", 0);
tmp = state->devices;
while (tmp != NULL){
+ GtkTreeIter iter;
+
+ gtk_list_store_append (list_store, &iter);
dev =(GPilotDevice*)tmp->data;
if(dev->type == PILOT_DEVICE_NETWORK) {
- menu_item = gtk_menu_item_new_with_label ("[network]");
+ gtk_list_store_set (list_store, &iter, 0, "[network]", -1);
} else if(dev->type == PILOT_DEVICE_BLUETOOTH) {
- menu_item = gtk_menu_item_new_with_label ("[bluetooth]");
-
+ gtk_list_store_set (list_store, &iter, 0, "[bluetooth]", -1);
} else {
- menu_item = gtk_menu_item_new_with_label (dev->port);
+ gtk_list_store_set (list_store, &iter, 0, dev->port, -1);
}
- gtk_object_set_data (GTK_OBJECT (menu_item), "device", dev);
- gtk_widget_show (menu_item);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
tmp = tmp->next;
}
- gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
- gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu), 0);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (device_combo), 0);
if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dlg))) {
- menu_item = gtk_menu_get_active (GTK_MENU (menu));
- dev = (GPilotDevice *)g_object_get_data (G_OBJECT (menu_item), "device");
+ index = gtk_combo_box_get_active(GTK_COMBO_BOX(device_combo));
+ dev = g_list_nth_data(state->devices, index);
} else {
dev = NULL;
}
diff --git a/conduits/backup/backup_conduit.c b/conduits/backup/backup_conduit.c
index 0331757..a9001f4 100644
--- a/conduits/backup/backup_conduit.c
+++ b/conduits/backup/backup_conduit.c
@@ -742,7 +742,7 @@ gnome_real_pilot_conduit_backup_restore (GnomePilotConduitBackup *conduit,
file_db **db;
int dbcount = 0;
int i, j;
- unsigned int size;
+ size_t size;
struct pi_file *file;
char *source;
int result = 0;
@@ -893,8 +893,8 @@ static GtkWidget
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
entry = gtk_entry_new ();
- gtk_entry_set_max_length(entry, 128);
- gtk_object_set_data(GTK_OBJECT(vbox), "dir", entry);
+ 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);
gtk_signal_connect(GTK_OBJECT(entry), "insert_text",
GTK_SIGNAL_FUNC(insert_dir_callback),
@@ -909,7 +909,7 @@ static GtkWidget
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1,2);
button = gtk_check_button_new();
- gtk_object_set_data(GTK_OBJECT(vbox), "only_changed", button);
+ g_object_set_data (G_OBJECT(vbox), "only_changed", button);
gtk_table_attach_defaults(GTK_TABLE(table), button, 1, 2, 1,2);
gtk_label_set_mnemonic_widget (GTK_LABEL(label), button);
@@ -921,7 +921,7 @@ static GtkWidget
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2,3);
button = gtk_check_button_new();
- gtk_object_set_data(GTK_OBJECT(vbox), "remove_local", button);
+ g_object_set_data (G_OBJECT(vbox), "remove_local", button);
gtk_table_attach_defaults(GTK_TABLE(table), button, 1, 2, 2,3);
gtk_label_set_mnemonic_widget (GTK_LABEL(label), button);
@@ -934,7 +934,7 @@ static GtkWidget
adjustment = gtk_adjustment_new (0, 0, 100, 1, 1, 1);
spin = gtk_spin_button_new (GTK_ADJUSTMENT(adjustment), 1, 0);
- gtk_object_set_data(GTK_OBJECT(vbox), "no_of_backups", adjustment);
+ g_object_set_data (G_OBJECT(vbox), "no_of_backups", adjustment);
gtk_table_attach_defaults(GTK_TABLE(table), spin, 1, 2, 3, 4);
gtk_label_set_mnemonic_widget (GTK_LABEL(label), spin);
@@ -1064,7 +1064,7 @@ create_settings_window (GnomePilotConduit *conduit, GtkWidget *parent, gpointer
gtk_container_add(GTK_CONTAINER(parent),cfgWindow);
gtk_widget_show_all(cfgWindow);
- gtk_object_set_data(GTK_OBJECT(conduit),OBJ_DATA_CONFIG_WINDOW,cfgWindow);
+ g_object_set_data (G_OBJECT(conduit),OBJ_DATA_CONFIG_WINDOW,cfgWindow);
setOptionsCfg(GET_CONDUIT_WINDOW(conduit),GET_CONDUIT_CFG(conduit));
return 0;
@@ -1108,10 +1108,10 @@ conduit_load_gpilot_conduit (GPilotPilot *pilot)
cfg2 = dupe_configuration(cfg);
- gtk_object_set_data(GTK_OBJECT(retval),OBJ_DATA_CONFIG,cfg);
- gtk_object_set_data(GTK_OBJECT(retval),OBJ_DATA_OLDCONFIG,cfg2);
+ g_object_set_data (G_OBJECT(retval),OBJ_DATA_CONFIG,cfg);
+ g_object_set_data (G_OBJECT(retval),OBJ_DATA_OLDCONFIG,cfg2);
- gtk_object_set_data(GTK_OBJECT(retval),
+ g_object_set_data (G_OBJECT(retval),
"configuration",
cfg);
diff --git a/conduits/file/gpilot_install_file.c b/conduits/file/gpilot_install_file.c
index 907b621..782533b 100644
--- a/conduits/file/gpilot_install_file.c
+++ b/conduits/file/gpilot_install_file.c
@@ -101,8 +101,7 @@ main (int argc, char *argv[])
gtk_init (&argc, &argv);
gpc = GNOME_PILOT_CLIENT (gnome_pilot_client_new ());
- g_object_ref (G_OBJECT (gpc));
- gtk_object_sink (GTK_OBJECT (gpc));
+ g_object_ref_sink (G_OBJECT (gpc));
gtk_signal_connect (GTK_OBJECT (gpc),"completed_request", (GtkSignalFunc)gpilotd_request_completed, NULL);
gnome_pilot_client_connect_to_daemon (gpc);
@@ -219,7 +218,7 @@ main (int argc, char *argv[])
g_free (message);
}
- gtk_object_unref (GTK_OBJECT (gpc));
+ g_object_unref (G_OBJECT (gpc));
return 0;
}
diff --git a/gpilotd/gnome-pilot-client.gob b/gpilotd/gnome-pilot-client.gob
index c640b00..9aed534 100644
--- a/gpilotd/gnome-pilot-client.gob
+++ b/gpilotd/gnome-pilot-client.gob
@@ -603,8 +603,9 @@ class Gnome:Pilot:Client from Gtk:Object {
g_return_val_if_fail (self->proxy != NULL, GPILOTD_ERR_NOT_CONNECTED);
error = NULL;
- res = dbus_g_proxy_call (self->proxy,
+ res = dbus_g_proxy_call_with_timeout (self->proxy,
"Noop",
+ 100,
&error,
G_TYPE_INVALID,
G_TYPE_INVALID);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1816196..15f671a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,11 +19,11 @@ conduits/backup/backup_conduit.h
conduits/evolution-data-server/address-conduit.c
conduits/evolution-data-server/calendar-conduit.c
conduits/evolution-data-server/e-pilot-settings.c
+conduits/evolution-data-server/memo-conduit.c
conduits/evolution-data-server/todo-conduit.c
conduits/file/file_conduit.c
conduits/file/file_conduit.h
conduits/file/gpilot_install_file.c
-gpilotd/GNOME_Pilot_Daemon.server.in.in
gpilotd/gnome-pilot-client.gob
gpilotd/gnome-pilot-conduit-config.gob
gpilotd/gnome-pilot-conduit-file.gob
@@ -36,12 +36,14 @@ gpilotd/gnome-pilot-conduit.gob
gpilotd/gnome-pilot-dbinfo.h
gpilotd/gnome-pilot-structures.c
gpilotd/gnome-pilot-structures.h
+gpilotd/gpilot-daemon.c
+gpilotd/gpilot-daemon.h
+gpilotd/gpilot-daemon.xml
gpilotd/gpilotd-session-wrapper.c
gpilotd/gpilotd.c
gpilotd/manager.c
gpilotd/manager.h
-gpilotd/orbit_daemon_glue.c
-gpilotd/orbit_daemon_glue.h
+gpilotd/org.gnome.GnomePilot.service.in
gpilotd/queue_io.c
gpilotd/queue_io.h
utils/gpilotd-client.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
