diff options
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/eventedit.c | 4 | ||||
| -rw-r--r-- | calendar/gncal-todo.c | 2 | ||||
| -rw-r--r-- | calendar/gui/eventedit.c | 4 | ||||
| -rw-r--r-- | calendar/gui/gncal-todo.c | 2 | ||||
| -rw-r--r-- | calendar/gui/year-view.c | 2 | ||||
| -rw-r--r-- | calendar/timeutil.c | 1 | ||||
| -rw-r--r-- | calendar/year-view.c | 2 |
8 files changed, 15 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 3bf40219c5..a609d6e4cc 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +1998-11-23 Herbert V. Riedel <hvr@hvrlab.ml.org> + + * eventedit.c: use GPOINTER_TO_INT + + * gncal-todo.c: same. + 1998-11-22 Matthew Wilson <msw@redhat.com> * main.c: Fixed the popt event parsing callback to have the diff --git a/calendar/eventedit.c b/calendar/eventedit.c index a24f2e2101..18659841c0 100644 --- a/calendar/eventedit.c +++ b/calendar/eventedit.c @@ -1317,7 +1317,7 @@ change_exception (GtkWidget *widget, EventEditor *ee) int sel; clist = GTK_CLIST (ee->recur_ex_clist); - sel = (gint) clist->selection->data; + sel = GPOINTER_TO_INT(clist->selection->data); t = gtk_clist_get_row_data (clist, sel); *t = gnome_date_edit_get_date (GNOME_DATE_EDIT (ee->recur_ex_date)); @@ -1332,7 +1332,7 @@ delete_exception (GtkWidget *widget, EventEditor *ee) int sel; clist = GTK_CLIST (ee->recur_ex_clist); - sel = (gint) clist->selection->data; + sel = GPOINTER_TO_INT(clist->selection->data); g_free (gtk_clist_get_row_data (clist, sel)); /* free the time_t stored there */ diff --git a/calendar/gncal-todo.c b/calendar/gncal-todo.c index d715c266eb..eae0e556ca 100644 --- a/calendar/gncal-todo.c +++ b/calendar/gncal-todo.c @@ -143,7 +143,7 @@ get_clist_selected_ico (GtkCList *clist) if (!clist->selection) return NULL; - sel = (gint) clist->selection->data; + sel = GPOINTER_TO_INT(clist->selection->data); return gtk_clist_get_row_data (clist, sel); } diff --git a/calendar/gui/eventedit.c b/calendar/gui/eventedit.c index a24f2e2101..18659841c0 100644 --- a/calendar/gui/eventedit.c +++ b/calendar/gui/eventedit.c @@ -1317,7 +1317,7 @@ change_exception (GtkWidget *widget, EventEditor *ee) int sel; clist = GTK_CLIST (ee->recur_ex_clist); - sel = (gint) clist->selection->data; + sel = GPOINTER_TO_INT(clist->selection->data); t = gtk_clist_get_row_data (clist, sel); *t = gnome_date_edit_get_date (GNOME_DATE_EDIT (ee->recur_ex_date)); @@ -1332,7 +1332,7 @@ delete_exception (GtkWidget *widget, EventEditor *ee) int sel; clist = GTK_CLIST (ee->recur_ex_clist); - sel = (gint) clist->selection->data; + sel = GPOINTER_TO_INT(clist->selection->data); g_free (gtk_clist_get_row_data (clist, sel)); /* free the time_t stored there */ diff --git a/calendar/gui/gncal-todo.c b/calendar/gui/gncal-todo.c index d715c266eb..eae0e556ca 100644 --- a/calendar/gui/gncal-todo.c +++ b/calendar/gui/gncal-todo.c @@ -143,7 +143,7 @@ get_clist_selected_ico (GtkCList *clist) if (!clist->selection) return NULL; - sel = (gint) clist->selection->data; + sel = GPOINTER_TO_INT(clist->selection->data); return gtk_clist_get_row_data (clist, sel); } diff --git a/calendar/gui/year-view.c b/calendar/gui/year-view.c index 113b842714..31d0d5c9e2 100644 --- a/calendar/gui/year-view.c +++ b/calendar/gui/year-view.c @@ -432,7 +432,7 @@ compute_min_size (YearView *yv) args[0].name = "text_width"; args[1].name = "text_height"; - gtk_object_getv (GTK_OBJECT (yv->heading), 1, args); + gtk_object_getv (GTK_OBJECT (yv->heading), 2, args); m_width = GTK_VALUE_DOUBLE (args[0]); m_height = 2 * HEAD_SPACING + GTK_VALUE_DOUBLE (args[1]); diff --git a/calendar/timeutil.c b/calendar/timeutil.c index 7a0550c069..07a1514c80 100644 --- a/calendar/timeutil.c +++ b/calendar/timeutil.c @@ -7,6 +7,7 @@ */ #include <libgnome/libgnome.h> +#include <string.h> #include "timeutil.h" #define digit_at(x,y) (x [y] - '0') diff --git a/calendar/year-view.c b/calendar/year-view.c index 113b842714..31d0d5c9e2 100644 --- a/calendar/year-view.c +++ b/calendar/year-view.c @@ -432,7 +432,7 @@ compute_min_size (YearView *yv) args[0].name = "text_width"; args[1].name = "text_height"; - gtk_object_getv (GTK_OBJECT (yv->heading), 1, args); + gtk_object_getv (GTK_OBJECT (yv->heading), 2, args); m_width = GTK_VALUE_DOUBLE (args[0]); m_height = 2 * HEAD_SPACING + GTK_VALUE_DOUBLE (args[1]); |