Patches
- From: JP Rosevear <jpr ximian com>
- To: eskil eskil org
- Cc: gnome-pilot-list gnome org
- Subject: Patches
- Date: 06 Dec 2001 15:27:42 -0500
g-p-capplet-settings.patch is to prevent a crash after running the
druid.
g-p-pdialog-close.patch prevents the dialog from being closed twice.
-JP
--
--
=======================================================================
JP Rosevear jpr ximian com
Ximian Inc. http://www.ximian.com
? pilot-orbit.patch
? pdialog-fixes.patch
? g-p-build.patch
? g-p-capplet-settings.patch
? applet/gpilot-applet-progress.c
? applet/gpilot-applet-progress.h
? applet/gpilot-applet-progress-private.h
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-pilot/ChangeLog,v
retrieving revision 1.196
diff -u -r1.196 ChangeLog
--- ChangeLog 2001/12/03 11:47:34 1.196
+++ ChangeLog 2001/12/06 19:43:23
@@ -1,3 +1,9 @@
+2001-12-06 JP Rosevear <jpr ximian com>
+
+ * gnome-pilot-capplet.c (gpcap_destroy): free the states when
+ finished
+ (gnome_pilot_capplet_update): properly reload the states
+
2001-12-03 Eskil Heyn Olsen <eskil eskil dk>
* configure.in:
Index: capplet/gnome-pilot-capplet.c
===================================================================
RCS file: /cvs/gnome/gnome-pilot/capplet/gnome-pilot-capplet.c,v
retrieving revision 1.5
diff -u -r1.5 gnome-pilot-capplet.c
--- capplet/gnome-pilot-capplet.c 2001/05/02 03:23:53 1.5
+++ capplet/gnome-pilot-capplet.c 2001/12/06 19:43:23
@@ -429,8 +429,10 @@
priv = gpcap->priv;
freePilotState (priv->orig_state);
-
- loadPilotState (&priv->state);
+ freePilotState (priv->state);
+
+ loadPilotState (&priv->orig_state);
+ priv->state = dupPilotState (priv->orig_state);
fill_widgets (gpcap);
}
@@ -798,6 +800,9 @@
GnomePilotCappletPrivate *priv;
priv = gpcap->priv;
+
+ freePilotState (priv->orig_state);
+ freePilotState (priv->state);
gtk_object_unref (GTK_OBJECT (priv->xml));
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-pilot/ChangeLog,v
retrieving revision 1.196
diff -u -r1.196 ChangeLog
--- ChangeLog 2001/12/03 11:47:34 1.196
+++ ChangeLog 2001/12/06 20:17:35
@@ -1,3 +1,11 @@
+2001-12-06 JP Rosevear <jpr ximian com>
+
+ * gnome-pilot-pdialog.c (gppd_userinfo_requested): don't close the
+ dialog here
+ (gppd_system_info_requested): or here
+ (gppd_request_completed): close it here after both requests have
+ completed
+
2001-12-03 Eskil Heyn Olsen <eskil eskil dk>
* configure.in:
Index: capplet/gnome-pilot-pdialog.c
===================================================================
RCS file: /cvs/gnome/gnome-pilot/capplet/gnome-pilot-pdialog.c,v
retrieving revision 1.4
diff -u -r1.4 gnome-pilot-pdialog.c
--- capplet/gnome-pilot-pdialog.c 2001/09/10 00:40:16 1.4
+++ capplet/gnome-pilot-pdialog.c 2001/12/06 20:17:35
@@ -295,11 +295,17 @@
priv = gppd->priv;
- if (handle != priv->handle1)
+ if (handle == priv->handle1)
+ priv->handle1 = -1;
+ else if (handle == priv->handle2)
+ priv->handle2 = -1;
+ else
return;
- gtk_widget_destroy (priv->sync_dialog);
- priv->sync_dialog = NULL;
+ if (priv->handle1 == -1 && priv->handle2 == -1) {
+ gtk_widget_destroy (priv->sync_dialog);
+ priv->sync_dialog = NULL;
+ }
}
static void
@@ -323,12 +329,6 @@
gtk_entry_set_text (GTK_ENTRY (priv->pilot_username), priv->pilot->pilot_username);
g_snprintf (buf, sizeof (buf), "%d", priv->pilot->pilot_id);
gtk_entry_set_text (GTK_ENTRY (priv->pilot_id), buf);
-
- priv->handle1 = -1;
- priv->handle2 = -1;
-
- gtk_widget_destroy (priv->sync_dialog);
- priv->sync_dialog = NULL;
}
static void
@@ -344,12 +344,6 @@
priv->pilot->creation = sysinfo->creation;
priv->pilot->romversion = sysinfo->romVersion;
-
- priv->handle1 = -1;
- priv->handle2 = -1;
-
- gtk_widget_destroy (priv->sync_dialog);
- priv->sync_dialog = NULL;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]