[evolution-patches] Cleanups of deprecated functions for the calendar component
- From: Kjartan Maraas <kmaraas broadpark no>
- To: evolution-patches ximian com
- Subject: [evolution-patches] Cleanups of deprecated functions for the calendar component
- Date: Wed, 29 Sep 2004 22:10:53 +0200
This is the same type of cleanup for the calendar.
This time against HEAD only.
Cheers
Kjartan
? gui/patch1
Index: conduits/calendar/calendar-conduit.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/conduits/calendar/calendar-conduit.c,v
retrieving revision 1.125
diff -u -p -r1.125 calendar-conduit.c
--- conduits/calendar/calendar-conduit.c 20 Sep 2004 13:08:47 -0000 1.125
+++ conduits/calendar/calendar-conduit.c 29 Sep 2004 20:09:56 -0000
@@ -118,15 +118,15 @@ calconduit_load_configuration (guint32 p
/* Sync Type */
management = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
- gtk_object_ref (GTK_OBJECT (management));
+ g_object_ref (G_OBJECT (management));
gtk_object_sink (GTK_OBJECT (management));
config = gnome_pilot_conduit_config_new (management, pilot_id);
- gtk_object_ref (GTK_OBJECT (config));
+ g_object_ref (G_OBJECT (config));
gtk_object_sink (GTK_OBJECT (config));
if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
c->sync_type = GnomePilotConduitSyncTypeNotSet;
- gtk_object_unref (GTK_OBJECT (config));
- gtk_object_unref (GTK_OBJECT (management));
+ g_object_unref (G_OBJECT (config));
+ g_object_unref (G_OBJECT (management));
/* Custom settings */
g_snprintf (prefix, 255, "/gnome-pilot.d/e-calendar-conduit/Pilot_%u/", pilot_id);
@@ -1905,34 +1905,34 @@ conduit_get_gpilot_conduit (guint32 pilo
g_assert (retval != NULL);
ctxt = e_calendar_context_new (pilot_id);
- gtk_object_set_data (GTK_OBJECT (retval), "calconduit_context", ctxt);
+ g_object_set_data (G_OBJECT (retval), "calconduit_context", ctxt);
/* Sync signals */
- gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
- gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
+ g_signal_connect (retval, "pre_sync", (GSignalFunc) pre_sync, ctxt);
+ g_signal_connect (retval, "post_sync", (GSignalFunc) post_sync, ctxt);
- gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
- gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
+ g_signal_connect (retval, "set_pilot_id", (GSignalFunc) set_pilot_id, ctxt);
+ g_signal_connect (retval, "set_status_cleared", (GSignalFunc) set_status_cleared, ctxt);
- gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
- gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
- gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
+ g_signal_connect (retval, "for_each", (GSignalFunc) for_each, ctxt);
+ g_signal_connect (retval, "for_each_modified", (GSignalFunc) for_each_modified, ctxt);
+ g_signal_connect (retval, "compare", (GSignalFunc) compare, ctxt);
- gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
- gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
- gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
- gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
+ g_signal_connect (retval, "add_record", (GSignalFunc) add_record, ctxt);
+ g_signal_connect (retval, "replace_record", (GSignalFunc) replace_record, ctxt);
+ g_signal_connect (retval, "delete_record", (GSignalFunc) delete_record, ctxt);
+ g_signal_connect (retval, "archive_record", (GSignalFunc) archive_record, ctxt);
- gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
- gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
+ g_signal_connect (retval, "match", (GSignalFunc) match, ctxt);
+ g_signal_connect (retval, "free_match", (GSignalFunc) free_match, ctxt);
- gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
+ g_signal_connect (retval, "prepare", (GSignalFunc) prepare, ctxt);
/* Gui Settings */
- gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
- gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
- gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
- gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
+ g_signal_connect (retval, "create_settings_window", (GSignalFunc) create_settings_window, ctxt);
+ g_signal_connect (retval, "display_settings", (GSignalFunc) display_settings, ctxt);
+ g_signal_connect (retval, "save_settings", (GSignalFunc) save_settings, ctxt);
+ g_signal_connect (retval, "revert_settings", (GSignalFunc) revert_settings, ctxt);
return GNOME_PILOT_CONDUIT (retval);
}
@@ -1943,7 +1943,7 @@ conduit_destroy_gpilot_conduit (GnomePil
GtkObject *obj = GTK_OBJECT (conduit);
ECalConduitContext *ctxt;
- ctxt = gtk_object_get_data (obj, "calconduit_context");
+ ctxt = g_object_get_data (G_OBJECT (obj), "calconduit_context");
e_calendar_context_destroy (ctxt);
gtk_object_destroy (obj);
Index: conduits/todo/todo-conduit.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/conduits/todo/todo-conduit.c,v
retrieving revision 1.94
diff -u -p -r1.94 todo-conduit.c
--- conduits/todo/todo-conduit.c 26 Aug 2004 02:12:07 -0000 1.94
+++ conduits/todo/todo-conduit.c 29 Sep 2004 20:09:57 -0000
@@ -122,15 +122,15 @@ todoconduit_load_configuration (guint32
c->pilot_id = pilot_id;
management = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
- gtk_object_ref (GTK_OBJECT (management));
+ g_object_ref (G_OBJECT (management));
gtk_object_sink (GTK_OBJECT (management));
config = gnome_pilot_conduit_config_new (management, pilot_id);
- gtk_object_ref (GTK_OBJECT (config));
+ g_object_ref (G_OBJECT (config));
gtk_object_sink (GTK_OBJECT (config));
if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
c->sync_type = GnomePilotConduitSyncTypeNotSet;
- gtk_object_unref (GTK_OBJECT (config));
- gtk_object_unref (GTK_OBJECT (management));
+ g_object_unref (G_OBJECT (config));
+ g_object_unref (G_OBJECT (management));
/* Custom settings */
gnome_config_push_prefix (prefix);
@@ -1394,33 +1394,33 @@ conduit_get_gpilot_conduit (guint32 pilo
g_assert (retval != NULL);
ctxt = e_todo_context_new (pilot_id);
- gtk_object_set_data (GTK_OBJECT (retval), "todoconduit_context", ctxt);
+ g_object_set_data (G_OBJECT (retval), "todoconduit_context", ctxt);
- gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
- gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
+ g_signal_connect (retval, "pre_sync", (GSignalFunc) pre_sync, ctxt);
+ g_signal_connect (retval, "post_sync", (GSignalFunc) post_sync, ctxt);
- gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
- gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
+ g_signal_connect (retval, "set_pilot_id", (GSignalFunc) set_pilot_id, ctxt);
+ g_signal_connect (retval, "set_status_cleared", (GSignalFunc) set_status_cleared, ctxt);
- gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
- gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
- gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
+ g_signal_connect (retval, "for_each", (GSignalFunc) for_each, ctxt);
+ g_signal_connect (retval, "for_each_modified", (GSignalFunc) for_each_modified, ctxt);
+ g_signal_connect (retval, "compare", (GSignalFunc) compare, ctxt);
- gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
- gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
- gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
- gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
+ g_signal_connect (retval, "add_record", (GSignalFunc) add_record, ctxt);
+ g_signal_connect (retval, "replace_record", (GSignalFunc) replace_record, ctxt);
+ g_signal_connect (retval, "delete_record", (GSignalFunc) delete_record, ctxt);
+ g_signal_connect (retval, "archive_record", (GSignalFunc) archive_record, ctxt);
- gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
- gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
+ g_signal_connect (retval, "match", (GSignalFunc) match, ctxt);
+ g_signal_connect (retval, "free_match", (GSignalFunc) free_match, ctxt);
- gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
+ g_signal_connect (retval, "prepare", (GSignalFunc) prepare, ctxt);
/* Gui Settings */
- gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
- gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
- gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
- gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
+ g_signal_connect (retval, "create_settings_window", (GSignalFunc) create_settings_window, ctxt);
+ g_signal_connect (retval, "display_settings", (GSignalFunc) display_settings, ctxt);
+ g_signal_connect (retval, "save_settings", (GSignalFunc) save_settings, ctxt);
+ g_signal_connect (retval, "revert_settings", (GSignalFunc) revert_settings, ctxt);
return GNOME_PILOT_CONDUIT (retval);
}
@@ -1428,11 +1428,11 @@ conduit_get_gpilot_conduit (guint32 pilo
void
conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
{
- GtkObject *obj = GTK_OBJECT (conduit);
+ GObject *obj = G_OBJECT (conduit);
EToDoConduitContext *ctxt;
- ctxt = gtk_object_get_data (obj, "todoconduit_context");
+ ctxt = g_object_get_data (obj, "todoconduit_context");
e_todo_context_destroy (ctxt);
- gtk_object_destroy (obj);
+ gtk_object_destroy (GTK_OBJECT (obj));
}
Index: gui/cal-search-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/cal-search-bar.c,v
retrieving revision 1.23
diff -u -p -r1.23 cal-search-bar.c
--- gui/cal-search-bar.c 27 May 2004 15:45:27 -0000 1.23
+++ gui/cal-search-bar.c 29 Sep 2004 20:09:57 -0000
@@ -25,6 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include <glib.h>
+#include <gtk/gtkmarshal.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkoptionmenu.h>
@@ -102,22 +103,24 @@ cal_search_bar_class_init (CalSearchBarC
parent_class = g_type_class_peek_parent (class);
cal_search_bar_signals[SEXP_CHANGED] =
- gtk_signal_new ("sexp_changed",
- GTK_RUN_FIRST,
- G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (CalSearchBarClass, sexp_changed),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_STRING);
+ g_signal_new ("sexp_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (CalSearchBarClass, sexp_changed),
+ NULL, NULL,
+ gtk_marshal_VOID__STRING,
+ G_TYPE_NONE, 1,
+ G_TYPE_STRING);
cal_search_bar_signals[CATEGORY_CHANGED] =
- gtk_signal_new ("category_changed",
- GTK_RUN_FIRST,
- G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (CalSearchBarClass, category_changed),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_STRING);
+ g_signal_new ("category_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (CalSearchBarClass, category_changed),
+ NULL, NULL,
+ gtk_marshal_VOID__STRING,
+ G_TYPE_NONE, 1,
+ G_TYPE_STRING);
class->sexp_changed = NULL;
class->category_changed = NULL;
Index: gui/calendar-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-commands.c,v
retrieving revision 1.152
diff -u -p -r1.152 calendar-commands.c
--- gui/calendar-commands.c 17 May 2004 20:21:59 -0000 1.152
+++ gui/calendar-commands.c 29 Sep 2004 20:09:57 -0000
@@ -152,7 +152,7 @@ set_clock_cursor (GnomeCalendar *gcal)
cursor = gdk_cursor_new (GDK_WATCH);
gdk_window_set_cursor (GTK_WIDGET (gcal)->window, cursor);
- gdk_cursor_destroy (cursor);
+ gdk_cursor_unref (cursor);
gdk_flush ();
}
@@ -644,9 +644,11 @@ gcal_calendar_focus_change_cb (GnomeCale
calendar_control_sensitize_calendar_commands (control, gcal, TRUE);
focus->calendar_focused = TRUE;
} else if (focus->calendar_focused) {
- gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
- G_CALLBACK (gcal_calendar_selection_changed_cb),
- control);
+ gtk_signal_compat_matched (GTK_OBJECT (gcal),
+ G_CALLBACK (gcal_calendar_selection_changed_cb),
+ control,
+ (GSignalMatchType) (G_SIGNAL_MATCH_FUNC |
+ G_SIGNAL_MATCH_DATA), 0);
calendar_control_sensitize_calendar_commands (control, gcal, FALSE);
focus->calendar_focused = FALSE;
}
@@ -675,9 +677,11 @@ gcal_taskpad_focus_change_cb (GnomeCalen
* of blindly assumming that we are getting this event because
* the taskpad was in fact focused.
*/
- gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
- G_CALLBACK (gcal_taskpad_selection_changed_cb),
- control);
+ gtk_signal_compat_matched (GTK_OBJECT (gcal),
+ G_CALLBACK (gcal_taskpad_selection_changed_cb),
+ control,
+ (GSignalMatchType) (G_SIGNAL_MATCH_FUNC |
+ G_SIGNAL_MATCH_DATA), 0);
sensitize_taskpad_commands (gcal, control, FALSE);
focus->taskpad_focused = FALSE;
}
Index: gui/e-calendar-table.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-table.c,v
retrieving revision 1.123
diff -u -p -r1.123 e-calendar-table.c
--- gui/e-calendar-table.c 5 Sep 2004 13:25:03 -0000 1.123
+++ gui/e-calendar-table.c 29 Sep 2004 20:09:57 -0000
@@ -502,7 +502,7 @@ e_calendar_table_init (ECalendarTable *c
pixbuf = e_icon_factory_get_icon ("stock_check-filled", E_ICON_SIZE_LIST);
e_table_extras_add_pixbuf(extras, "complete", pixbuf);
- gdk_pixbuf_unref(pixbuf);
+ g_object_unref(pixbuf);
/* Create the table */
Index: gui/e-day-view-main-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view-main-item.c,v
retrieving revision 1.37
diff -u -p -r1.37 e-day-view-main-item.c
--- gui/e-day-view-main-item.c 19 Apr 2004 15:19:32 -0000 1.37
+++ gui/e-day-view-main-item.c 29 Sep 2004 20:09:57 -0000
@@ -737,7 +737,7 @@ e_day_view_main_item_draw_day_event (EDa
gdk_gc_set_clip_origin (gc, icon_x, icon_y);
if (mask != NULL)
gdk_gc_set_clip_mask (gc, mask);
- gdk_draw_pixmap (drawable, gc,
+ gdk_draw_drawable (drawable, gc,
pixmap,
0, 0, icon_x, icon_y,
MIN (E_DAY_VIEW_ICON_WIDTH,
@@ -745,9 +745,9 @@ e_day_view_main_item_draw_day_event (EDa
MIN (E_DAY_VIEW_ICON_HEIGHT,
max_icon_h));
- gdk_pixmap_unref (pixmap);
+ gdk_drawable_unref (pixmap);
if (mask != NULL)
- gdk_bitmap_unref (mask);
+ gdk_drawable_unref (mask);
icon_x += icon_x_inc;
icon_y += icon_y_inc;
Index: gui/e-day-view-time-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view-time-item.c,v
retrieving revision 1.28
diff -u -p -r1.28 e-day-view-time-item.c
--- gui/e-day-view-time-item.c 7 Nov 2003 05:51:59 -0000 1.28
+++ gui/e-day-view-time-item.c 29 Sep 2004 20:09:57 -0000
@@ -531,9 +531,9 @@ e_day_view_time_item_show_popup_menu (ED
g_snprintf (buffer, sizeof (buffer),
_("%02i minute divisions"), divisions[i]);
item = gtk_radio_menu_item_new_with_label (group, buffer);
- group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item));
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
gtk_widget_show (item);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
if (current_divisions == divisions[i])
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
Index: gui/e-day-view-top-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view-top-item.c,v
retrieving revision 1.41
diff -u -p -r1.41 e-day-view-top-item.c
--- gui/e-day-view-top-item.c 9 Jul 2004 16:29:44 -0000 1.41
+++ gui/e-day-view-top-item.c 29 Sep 2004 20:09:57 -0000
@@ -568,7 +568,7 @@ e_day_view_top_item_draw_long_event (EDa
gdk_gc_set_clip_origin (gc, icon_x, icon_y);
if (mask != NULL)
gdk_gc_set_clip_mask (gc, mask);
- gdk_draw_pixmap (drawable, gc,
+ gdk_draw_drawable (drawable, gc,
pixmap,
0, 0, icon_x, icon_y,
E_DAY_VIEW_ICON_WIDTH,
@@ -576,9 +576,9 @@ e_day_view_top_item_draw_long_event (EDa
icon_x -= icon_x_inc;
}
- gdk_pixmap_unref (pixmap);
+ gdk_drawable_unref (pixmap);
if (mask != NULL)
- gdk_bitmap_unref (mask);
+ gdk_drawable_unref (mask);
}
e_cal_component_free_categories_list (categories_list);
Index: gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.252
diff -u -p -r1.252 e-day-view.c
--- gui/e-day-view.c 2 Aug 2004 07:33:38 -0000 1.252
+++ gui/e-day-view.c 29 Sep 2004 20:09:59 -0000
@@ -1278,7 +1278,7 @@ e_day_view_unrealize (GtkWidget *widget)
day_view = E_DAY_VIEW (widget);
- gdk_gc_unref (day_view->main_gc);
+ g_object_unref (day_view->main_gc);
day_view->main_gc = NULL;
colormap = gtk_widget_get_colormap (widget);
@@ -2145,7 +2145,7 @@ e_day_view_find_work_week_start (EDayVi
week start day. */
/* Get the weekday corresponding to start_time, 0 (Sun) to 6 (Sat). */
- weekday = g_date_weekday (&date) % 7;
+ weekday = g_date_get_weekday (&date) % 7;
/* Calculate the first working day of the week, 0 (Sun) to 6 (Sat).
It will automatically default to the week start day if no days
@@ -2166,9 +2166,9 @@ e_day_view_find_work_week_start (EDayVi
g_date_subtract_days (&date, offset);
}
- tt.year = g_date_year (&date);
- tt.month = g_date_month (&date);
- tt.day = g_date_day (&date);
+ tt.year = g_date_get_year (&date);
+ tt.month = g_date_get_month (&date);
+ tt.day = g_date_get_day (&date);
return icaltime_as_timet_with_zone (tt, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
}
@@ -2802,7 +2802,7 @@ e_day_view_convert_event_coords (EDayVie
}
while (event_window && event_window != window
- && event_window != GDK_ROOT_PARENT()) {
+ && event_window != gdk_get_default_root_window()) {
gdk_window_get_position (event_window, &win_x, &win_y);
event_x += win_x;
event_y += win_y;
@@ -2950,8 +2950,8 @@ e_day_view_on_long_event_button_press (E
} else if (event->type == GDK_2BUTTON_PRESS) {
e_day_view_on_event_double_click (day_view, -1,
event_num);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (day_view->top_canvas),
- "button_press_event");
+ g_signal_stop_emission_by_name ((gpointer *)(day_view->top_canvas),
+ "button_press_event");
return TRUE;
}
} else if (event->button == 3) {
@@ -2992,8 +2992,8 @@ e_day_view_on_event_button_press (EDayVi
} else if (event->type == GDK_2BUTTON_PRESS) {
e_day_view_on_event_double_click (day_view, day,
event_num);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (day_view->main_canvas),
- "button_press_event");
+ g_signal_stop_emission_by_name ((gpointer *)(day_view->main_canvas),
+ "button_press_event");
return TRUE;
}
} else if (event->button == 3) {
@@ -5672,12 +5672,12 @@ e_day_view_on_text_item_event (GnomeCanv
/* Stop the signal last or we will also stop any
other events getting to the EText item. */
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
- "event");
+ g_signal_stop_emission_by_name ((gpointer *)(item),
+ "event");
return TRUE;
} else if (event->key.keyval == GDK_Escape) {
cancel_editing (day_view);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
+ g_signal_stop_emission_by_name ((gpointer *)(item), "event");
/* focus should go to day view when stop editing */
gtk_widget_grab_focus (GTK_WIDGET (day_view));
return TRUE;
@@ -5705,7 +5705,7 @@ e_day_view_on_text_item_event (GnomeCanv
case GDK_BUTTON_RELEASE:
/* Only let the EText handle the event while editing. */
if (!E_TEXT (item)->editing)
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
+ g_signal_stop_emission_by_name ((gpointer *)(item),
"event");
break;
case GDK_FOCUS_CHANGE:
@@ -6196,7 +6196,7 @@ void
e_day_view_stop_auto_scroll (EDayView *day_view)
{
if (day_view->auto_scroll_timeout_id != 0) {
- gtk_timeout_remove (day_view->auto_scroll_timeout_id);
+ g_source_remove (day_view->auto_scroll_timeout_id);
day_view->auto_scroll_timeout_id = 0;
}
}
@@ -6237,18 +6237,8 @@ e_day_view_auto_scroll_handler (gpointer
/* NOTE: This reduces flicker, but only works if we don't use
canvas items which have X windows. */
- /* FIXME: Since GNOME 2.0 we can't do this, since the canvas
- * won't update when its's thawed. Is this a bug or should we
- * really be doing something else? Investigate. */
-#if 0
- gtk_layout_freeze (GTK_LAYOUT (day_view->main_canvas));
-#endif
-
gnome_canvas_scroll_to (GNOME_CANVAS (day_view->main_canvas),
scroll_x, new_scroll_y);
-#if 0
- gtk_layout_thaw (GTK_LAYOUT (day_view->main_canvas));
-#endif
}
canvas_x = day_view->last_mouse_x + scroll_x;
@@ -7498,7 +7488,7 @@ static void
e_day_view_cancel_layout (EDayView *day_view)
{
if (day_view->layout_timeout_id != 0) {
- gtk_timeout_remove (day_view->layout_timeout_id);
+ g_source_remove (day_view->layout_timeout_id);
day_view->layout_timeout_id = 0;
}
}
Index: gui/e-meeting-attendee.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-attendee.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-meeting-attendee.c
--- gui/e-meeting-attendee.c 7 Nov 2003 05:51:59 -0000 1.11
+++ gui/e-meeting-attendee.c 29 Sep 2004 20:09:59 -0000
@@ -883,7 +883,7 @@ e_meeting_attendee_add_busy_period (EMee
priv->has_calendar_info = TRUE;
priv->busy_periods_sorted = FALSE;
- period_in_days = g_date_julian (&period.end.date) - g_date_julian (&period.start.date) + 1;
+ period_in_days = g_date_get_julian (&period.end.date) - g_date_get_julian (&period.start.date) + 1;
priv->longest_period_in_days = MAX (priv->longest_period_in_days, period_in_days);
return TRUE;
Index: gui/e-meeting-store.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-store.c,v
retrieving revision 1.7
diff -u -p -r1.7 e-meeting-store.c
--- gui/e-meeting-store.c 20 May 2004 01:16:56 -0000 1.7
+++ gui/e-meeting-store.c 29 Sep 2004 20:09:59 -0000
@@ -840,7 +840,7 @@ e_meeting_store_find_attendee (EMeetingS
attendee = g_ptr_array_index (store->priv->attendees, i);
attendee_address = e_meeting_attendee_get_address (attendee);
- if (attendee_address && !g_strcasecmp (itip_strip_mailto (attendee_address), itip_strip_mailto (address))) {
+ if (attendee_address && !g_ascii_strcasecmp (itip_strip_mailto (attendee_address), itip_strip_mailto (address))) {
if (row != NULL)
*row = i;
@@ -1152,17 +1152,17 @@ refresh_busy_periods (gpointer data)
const char *user;
itt = icaltime_null_time ();
- itt.year = g_date_year (&qdata->start.date);
- itt.month = g_date_month (&qdata->start.date);
- itt.day = g_date_day (&qdata->start.date);
+ itt.year = g_date_get_year (&qdata->start.date);
+ itt.month = g_date_get_month (&qdata->start.date);
+ itt.day = g_date_get_day (&qdata->start.date);
itt.hour = qdata->start.hour;
itt.minute = qdata->start.minute;
startt = icaltime_as_timet_with_zone (itt, priv->zone);
itt = icaltime_null_time ();
- itt.year = g_date_year (&qdata->end.date);
- itt.month = g_date_month (&qdata->end.date);
- itt.day = g_date_day (&qdata->end.date);
+ itt.year = g_date_get_year (&qdata->end.date);
+ itt.month = g_date_get_month (&qdata->end.date);
+ itt.day = g_date_get_day (&qdata->end.date);
itt.hour = qdata->end.hour;
itt.minute = qdata->end.minute;
endt = icaltime_as_timet_with_zone (itt, priv->zone);
Index: gui/e-meeting-time-sel-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel-item.c,v
retrieving revision 1.14
diff -u -p -r1.14 e-meeting-time-sel-item.c
--- gui/e-meeting-time-sel-item.c 30 Sep 2003 22:39:02 -0000 1.14
+++ gui/e-meeting-time-sel-item.c 29 Sep 2004 20:09:59 -0000
@@ -166,11 +166,11 @@ e_meeting_time_selector_item_destroy (Gt
mts_item = E_MEETING_TIME_SELECTOR_ITEM (object);
if (mts_item->normal_cursor) {
- gdk_cursor_destroy (mts_item->normal_cursor);
+ gdk_cursor_unref (mts_item->normal_cursor);
mts_item->normal_cursor = NULL;
}
if (mts_item->resize_cursor) {
- gdk_cursor_destroy (mts_item->resize_cursor);
+ gdk_cursor_unref (mts_item->resize_cursor);
mts_item->resize_cursor = NULL;
}
@@ -223,9 +223,9 @@ e_meeting_time_selector_item_unrealize (
mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
- gdk_gc_unref (mts_item->main_gc);
+ g_object_unref (mts_item->main_gc);
mts_item->main_gc = NULL;
- gdk_gc_unref (mts_item->stipple_gc);
+ g_object_unref (mts_item->stipple_gc);
mts_item->stipple_gc = NULL;
if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
@@ -861,14 +861,14 @@ e_meeting_time_selector_item_button_pres
/* Set the new meeting time. */
e_meeting_time_selector_set_meeting_time (mts_item->mts,
- g_date_year (start_date),
- g_date_month (start_date),
- g_date_day (start_date),
+ g_date_get_year (start_date),
+ g_date_get_month (start_date),
+ g_date_get_day (start_date),
start_time.hour,
start_time.minute,
- g_date_year (end_date),
- g_date_month (end_date),
- g_date_day (end_date),
+ g_date_get_year (end_date),
+ g_date_get_month (end_date),
+ g_date_get_day (end_date),
end_time.hour,
end_time.minute);
Index: gui/e-meeting-time-sel.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel.c,v
retrieving revision 1.63
diff -u -p -r1.63 e-meeting-time-sel.c
--- gui/e-meeting-time-sel.c 29 Sep 2004 16:45:52 -0000 1.63
+++ gui/e-meeting-time-sel.c 29 Sep 2004 20:10:00 -0000
@@ -226,12 +226,14 @@ e_meeting_time_selector_class_init (EMee
widget_class = (GtkWidgetClass *) klass;
mts_signals [CHANGED] =
- gtk_signal_new ("changed", GTK_RUN_FIRST,
- G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (EMeetingTimeSelectorClass,
- changed),
- gtk_signal_default_marshaller,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (EMeetingTimeSelectorClass,
+ changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
object_class->destroy = e_meeting_time_selector_destroy;
@@ -476,7 +478,7 @@ e_meeting_time_selector_construct (EMeet
gtk_widget_show (menuitem);
menuitem = gtk_menu_item_new ();
- gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (mts->options_menu), menuitem);
gtk_widget_set_sensitive (menuitem, FALSE);
gtk_widget_show (menuitem);
@@ -804,7 +806,7 @@ e_meeting_time_selector_destroy (GtkObje
e_meeting_time_selector_remove_timeout (mts);
if (mts->stipple) {
- gdk_bitmap_unref (mts->stipple);
+ gdk_drawable_unref (mts->stipple);
mts->stipple = NULL;
}
@@ -842,7 +844,7 @@ e_meeting_time_selector_unrealize (GtkWi
mts = E_MEETING_TIME_SELECTOR (widget);
- gdk_gc_unref (mts->color_key_gc);
+ g_object_unref (mts->color_key_gc);
mts->color_key_gc = NULL;
if (GTK_WIDGET_CLASS (parent_class)->unrealize)
@@ -1009,15 +1011,15 @@ e_meeting_time_selector_get_meeting_time
gint *end_hour,
gint *end_minute)
{
- *start_year = g_date_year (&mts->meeting_start_time.date);
- *start_month = g_date_month (&mts->meeting_start_time.date);
- *start_day = g_date_day (&mts->meeting_start_time.date);
+ *start_year = g_date_get_year (&mts->meeting_start_time.date);
+ *start_month = g_date_get_month (&mts->meeting_start_time.date);
+ *start_day = g_date_get_day (&mts->meeting_start_time.date);
*start_hour = mts->meeting_start_time.hour;
*start_minute = mts->meeting_start_time.minute;
- *end_year = g_date_year (&mts->meeting_end_time.date);
- *end_month = g_date_month (&mts->meeting_end_time.date);
- *end_day = g_date_day (&mts->meeting_end_time.date);
+ *end_year = g_date_get_year (&mts->meeting_end_time.date);
+ *end_month = g_date_get_month (&mts->meeting_end_time.date);
+ *end_day = g_date_get_day (&mts->meeting_end_time.date);
*end_hour = mts->meeting_end_time.hour;
*end_minute = mts->meeting_end_time.minute;
}
@@ -1186,7 +1188,7 @@ e_meeting_time_selector_refresh_cb (gpoi
if (mts->display_main != NULL)
gtk_widget_queue_draw (mts->display_main);
- gtk_object_unref (GTK_OBJECT (mts));
+ g_object_unref (G_OBJECT (mts));
}
static void
@@ -1212,9 +1214,9 @@ e_meeting_time_selector_refresh_free_bus
int i;
for (i = 0; i < e_meeting_store_count_actual_attendees (mts->model); i++)
- gtk_object_ref (GTK_OBJECT (mts));
+ g_object_ref (G_OBJECT (mts));
} else {
- gtk_object_ref (GTK_OBJECT (mts));
+ g_object_ref (G_OBJECT (mts));
}
if (all)
@@ -1631,7 +1633,7 @@ e_meeting_time_selector_calculate_time_d
gint *hours,
gint *minutes)
{
- *days = g_date_julian (&end->date) - g_date_julian (&start->date);
+ *days = g_date_get_julian (&end->date) - g_date_get_julian (&start->date);
*hours = end->hour - start->hour;
*minutes = end->minute - start->minute;
if (*minutes < 0) {
@@ -2581,18 +2583,12 @@ e_meeting_time_selector_timeout_handler
gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
scroll:
- /* Redraw the canvases. We freeze and thaw the layouts so that they
- get redrawn completely. Otherwise the pixels get scrolled left or
- right which is not good for us (since our vertical bars have been
- moved) and causes flicker. */
- gtk_layout_freeze (GTK_LAYOUT (mts->display_main));
- gtk_layout_freeze (GTK_LAYOUT (mts->display_top));
+ /* Redraw the canvases. */
+
gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_main),
scroll_x, scroll_y);
gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_top),
scroll_x, scroll_y);
- gtk_layout_thaw (GTK_LAYOUT (mts->display_main));
- gtk_layout_thaw (GTK_LAYOUT (mts->display_top));
GDK_THREADS_LEAVE ();
return TRUE;
@@ -2615,9 +2611,9 @@ static void
e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts)
{
e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (mts->start_date_edit),
- g_date_year (&mts->meeting_start_time.date),
- g_date_month (&mts->meeting_start_time.date),
- g_date_day (&mts->meeting_start_time.date),
+ g_date_get_year (&mts->meeting_start_time.date),
+ g_date_get_month (&mts->meeting_start_time.date),
+ g_date_get_day (&mts->meeting_start_time.date),
mts->meeting_start_time.hour,
mts->meeting_start_time.minute);
}
@@ -2634,9 +2630,9 @@ e_meeting_time_selector_update_end_date_
g_date_subtract_days (&date, 1);
e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (mts->end_date_edit),
- g_date_year (&date),
- g_date_month (&date),
- g_date_day (&date),
+ g_date_get_year (&date),
+ g_date_get_month (&date),
+ g_date_get_day (&date),
mts->meeting_end_time.hour,
mts->meeting_end_time.minute);
}
@@ -2809,7 +2805,7 @@ e_meeting_time_selector_calculate_time_p
/* Calculate the number of days since the first date shown in the
entire canvas scroll region. */
- date_offset = g_date_julian (&mtstime->date) - g_date_julian (&mts->first_date_shown);
+ date_offset = g_date_get_julian (&mtstime->date) - g_date_get_julian (&mts->first_date_shown);
/* Calculate the x pixel coordinate of the start of the day. */
x = date_offset * mts->day_width;
Index: gui/e-tasks.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-tasks.c,v
retrieving revision 1.103
diff -u -p -r1.103 e-tasks.c
--- gui/e-tasks.c 25 Aug 2004 10:44:58 -0000 1.103
+++ gui/e-tasks.c 29 Sep 2004 20:10:00 -0000
@@ -554,11 +554,12 @@ e_tasks_class_init (ETasksClass *class)
parent_class = gtk_type_class (GTK_TYPE_TABLE);
e_tasks_signals[SELECTION_CHANGED] =
- gtk_signal_new ("selection_changed",
- GTK_RUN_LAST,
+ g_signal_new ("selection_changed",
G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (ETasksClass, selection_changed),
- gtk_marshal_NONE__INT,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ETasksClass, selection_changed),
+ NULL, NULL,
+ gtk_marshal_VOID__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
Index: gui/e-timezone-entry.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-timezone-entry.c,v
retrieving revision 1.25
diff -u -p -r1.25 e-timezone-entry.c
--- gui/e-timezone-entry.c 17 May 2004 19:53:11 -0000 1.25
+++ gui/e-timezone-entry.c 29 Sep 2004 20:10:00 -0000
@@ -94,13 +94,14 @@ e_timezone_entry_class_init (ETimezoneE
widget_class->mnemonic_activate = e_timezone_entry_mnemonic_activate;
timezone_entry_signals[CHANGED] =
- gtk_signal_new ("changed",
- GTK_RUN_LAST,
+ g_signal_new ("changed",
G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (ETimezoneEntryClass,
- changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ETimezoneEntryClass,
+ changed),
+ NULL, NULL,
+ gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
object_class->destroy = e_timezone_entry_destroy;
@@ -122,7 +123,7 @@ e_timezone_entry_init (ETimezoneEntry *
priv->default_zone = NULL;
priv->entry = gtk_entry_new ();
- gtk_entry_set_editable (GTK_ENTRY (priv->entry), FALSE);
+ gtk_editable_set_editable (GTK_EDITABLE (priv->entry), FALSE);
/*gtk_widget_set_usize (priv->date_entry, 90, 0);*/
gtk_box_pack_start (GTK_BOX (tentry), priv->entry, TRUE, TRUE, 6);
gtk_widget_show (priv->entry);
Index: gui/e-week-view-event-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view-event-item.c,v
retrieving revision 1.48
diff -u -p -r1.48 e-week-view-event-item.c
--- gui/e-week-view-event-item.c 9 Jul 2004 16:29:44 -0000 1.48
+++ gui/e-week-view-event-item.c 29 Sep 2004 20:10:00 -0000
@@ -696,16 +696,16 @@ e_week_view_event_item_draw_icons (EWeek
gdk_gc_set_clip_origin (gc, icon_x, icon_y);
if (mask != NULL)
gdk_gc_set_clip_mask (gc, mask);
- gdk_draw_pixmap (drawable, gc,
+ gdk_draw_drawable (drawable, gc,
pixmap,
0, 0, icon_x, icon_y,
E_WEEK_VIEW_ICON_WIDTH,
E_WEEK_VIEW_ICON_HEIGHT);
icon_x += icon_x_inc;
}
- gdk_pixmap_unref (pixmap);
+ gdk_drawable_unref (pixmap);
if (mask != NULL)
- gdk_bitmap_unref (mask);
+ gdk_drawable_unref (mask);
}
e_cal_component_free_categories_list (categories_list);
@@ -865,8 +865,8 @@ e_week_view_event_item_button_press (EWe
e_week_view_show_popup_menu (week_view,
(GdkEventButton*) bevent,
wveitem->event_num);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
- "button_press_event");
+ g_signal_stop_emission_by_name ((gpointer *)(item->canvas),
+ "button_press_event");
return TRUE;
}
Index: gui/e-week-view-main-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view-main-item.c,v
retrieving revision 1.20
diff -u -p -r1.20 e-week-view-main-item.c
--- gui/e-week-view-main-item.c 11 Dec 2003 01:48:25 -0000 1.20
+++ gui/e-week-view-main-item.c 29 Sep 2004 20:10:00 -0000
@@ -234,8 +234,8 @@ e_week_view_main_item_draw_day (EWeekVie
g_return_if_fail (gc != NULL);
- month = g_date_month (date);
- day_of_month = g_date_day (date);
+ month = g_date_get_month (date);
+ day_of_month = g_date_get_day (date);
line_y = y + E_WEEK_VIEW_DATE_T_PAD +
PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) +
@@ -351,9 +351,9 @@ e_week_view_main_item_draw_day (EWeekVie
/* Check if we are drawing today */
tt = icaltime_from_timet_with_zone (time (NULL), FALSE,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
- if (g_date_year (date) == tt.year
- && g_date_month (date) == tt.month
- && g_date_day (date) == tt.day)
+ if (g_date_get_year (date) == tt.year
+ && g_date_get_month (date) == tt.month
+ && g_date_get_day (date) == tt.day)
gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_TODAY]);
else
gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_DATES]);
Index: gui/e-week-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view.c,v
retrieving revision 1.223
diff -u -p -r1.223 e-week-view.c
--- gui/e-week-view.c 8 Sep 2004 17:34:46 -0000 1.223
+++ gui/e-week-view.c 29 Sep 2004 20:10:01 -0000
@@ -512,9 +512,9 @@ timezone_changed_cb (ECalendarView *cal_
/* Recalculate the new start of the first week. We just use exactly
the same time, but with the new timezone. */
- tt.year = g_date_year (&week_view->first_day_shown);
- tt.month = g_date_month (&week_view->first_day_shown);
- tt.day = g_date_day (&week_view->first_day_shown);
+ tt.year = g_date_get_year (&week_view->first_day_shown);
+ tt.month = g_date_get_month (&week_view->first_day_shown);
+ tt.day = g_date_get_day (&week_view->first_day_shown);
lower = icaltime_as_timet_with_zone (tt, new_zone);
@@ -643,7 +643,7 @@ e_week_view_init (EWeekView *week_view)
}
week_view->focused_jump_button = E_WEEK_VIEW_JUMP_BUTTON_NO_FOCUS;
- gdk_pixbuf_unref (pixbuf);
+ g_object_unref (pixbuf);
/*
* Scrollbar.
@@ -829,7 +829,7 @@ e_week_view_unrealize (GtkWidget *widget
week_view = E_WEEK_VIEW (widget);
- gdk_gc_unref (week_view->main_gc);
+ g_object_unref (week_view->main_gc);
week_view->main_gc = NULL;
colormap = gtk_widget_get_colormap (widget);
@@ -1425,16 +1425,16 @@ e_week_view_set_selected_time_range (ECa
time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
/* Set the selection to the given days. */
- week_view->selection_start_day = g_date_julian (&date)
- - g_date_julian (&week_view->base_date);
+ week_view->selection_start_day = g_date_get_julian (&date)
+ - g_date_get_julian (&week_view->base_date);
if (end_time == start_time
|| end_time <= time_add_day_with_zone (start_time, 1,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view))))
week_view->selection_end_day = week_view->selection_start_day;
else {
time_to_gdate_with_zone (&end_date, end_time - 60, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
- week_view->selection_end_day = g_date_julian (&end_date)
- - g_date_julian (&week_view->base_date);
+ week_view->selection_end_day = g_date_get_julian (&end_date)
+ - g_date_get_julian (&base_date);
}
/* Make sure the selection is valid. */
@@ -1468,16 +1468,16 @@ e_week_view_set_selected_time_range_visi
time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
/* Set the selection to the given days. */
- week_view->selection_start_day = g_date_julian (&date)
- - g_date_julian (&week_view->first_day_shown);
+ week_view->selection_start_day = g_date_get_julian (&date)
+ - g_date_get_julian (&week_view->first_day_shown);
if (end_time == start_time
|| end_time <= time_add_day_with_zone (start_time, 1,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view))))
week_view->selection_end_day = week_view->selection_start_day;
else {
time_to_gdate_with_zone (&end_date, end_time - 60, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
- week_view->selection_end_day = g_date_julian (&end_date)
- - g_date_julian (&week_view->first_day_shown);
+ week_view->selection_end_day = g_date_get_julian (&end_date)
+ - g_date_get_julian (&week_view->first_day_shown);
}
/* Make sure the selection is valid. */
@@ -1567,15 +1567,15 @@ e_week_view_set_first_day_shown (EWeekV
/* Calculate the old selection range. */
if (week_view->selection_start_day != -1) {
old_selection_start_julian =
- g_date_julian (&week_view->base_date)
+ g_date_get_julian (&week_view->base_date)
+ week_view->selection_start_day;
old_selection_end_julian =
- g_date_julian (&week_view->base_date)
+ g_date_get_julian (&week_view->base_date)
+ week_view->selection_end_day;
}
/* Calculate the weekday of the given date, 0 = Mon. */
- weekday = g_date_weekday (date) - 1;
+ weekday = g_date_get_weekday (date) - 1;
/* Convert it to an offset from the start of the display. */
day_offset = (weekday + 7 - week_view->display_start_day) % 7;
@@ -1597,9 +1597,9 @@ e_week_view_set_first_day_shown (EWeekV
|| g_date_compare (&week_view->first_day_shown, &base_date)) {
week_view->first_day_shown = base_date;
- start_tt.year = g_date_year (&base_date);
- start_tt.month = g_date_month (&base_date);
- start_tt.day = g_date_day (&base_date);
+ start_tt.year = g_date_get_year (&base_date);
+ start_tt.month = g_date_get_month (&base_date);
+ start_tt.day = g_date_get_day (&base_date);
start_time = icaltime_as_timet_with_zone (start_tt,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
@@ -1612,9 +1612,9 @@ e_week_view_set_first_day_shown (EWeekV
just select the first day. */
if (week_view->selection_start_day != -1) {
week_view->selection_start_day = old_selection_start_julian
- - g_date_julian (&base_date);
+ - g_date_get_julian (&base_date);
week_view->selection_end_day = old_selection_end_julian
- - g_date_julian (&base_date);
+ - g_date_get_julian (&base_date);
/* Make sure the selection is valid. */
num_days = week_view->multi_week_view
@@ -2987,12 +2987,12 @@ e_week_view_on_text_item_event (GnomeCan
/* Stop the signal last or we will also stop any
other events getting to the EText item. */
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
- "event");
+ g_signal_stop_emission_by_name ((gpointer *)(item),
+ "event");
return TRUE;
} else if (gdkevent->key.keyval == GDK_Escape) {
cancel_editing (week_view);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
+ gtk_signal_stop_emission_by_name ((gpointer *)(item), "event");
/* focus should go to week view when stop editing */
gtk_widget_grab_focus (GTK_WIDGET (week_view));
return TRUE;
@@ -3010,7 +3010,7 @@ e_week_view_on_text_item_event (GnomeCan
event->comp_data->client,
event->comp_data->icalcomp, FALSE);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
+ g_signal_stop_emission_by_name ((gpointer *)(item), "event");
return TRUE;
case GDK_BUTTON_PRESS:
if (!e_week_view_find_event_from_item (week_view, item,
@@ -3034,8 +3034,8 @@ e_week_view_on_text_item_event (GnomeCan
(GdkEventButton*) gdkevent,
event_num);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
- "button_press_event");
+ g_signal_stop_emission_by_name ((gpointer *)(item->canvas),
+ "button_press_event");
return TRUE;
}
@@ -3046,8 +3046,8 @@ e_week_view_on_text_item_event (GnomeCan
/* Only let the EText handle the event while editing. */
if (!E_TEXT (item)->editing) {
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
- "event");
+ g_signal_stop_emission_by_name ((gpointer *)(item),
+ "event");
if (gdkevent) {
week_view->drag_event_x = gdkevent->button.x;
@@ -3082,8 +3082,8 @@ e_week_view_on_text_item_event (GnomeCan
/* Stop the signal last or we will also stop any
other events getting to the EText item. */
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
- "event");
+ g_signal_stop_emission_by_name ((gpointer *)(item),
+ "event");
return TRUE;
}
week_view->pressed_event_num = -1;
@@ -4017,7 +4017,7 @@ e_week_view_on_jump_button_event (GnomeC
pixbuf, NULL);
}
if (pixbuf)
- gdk_pixbuf_unref (pixbuf);
+ g_object_unref (pixbuf);
}
return FALSE;
@@ -4090,7 +4090,7 @@ static void
e_week_view_cancel_layout (EWeekView *week_view)
{
if (week_view->layout_timeout_id != 0) {
- gtk_timeout_remove (week_view->layout_timeout_id);
+ g_source_remove (week_view->layout_timeout_id);
week_view->layout_timeout_id = 0;
}
}
Index: gui/goto.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/goto.c,v
retrieving revision 1.43
diff -u -p -r1.43 goto.c
--- gui/goto.c 6 Feb 2004 03:03:44 -0000 1.43
+++ gui/goto.c 29 Sep 2004 20:10:01 -0000
@@ -90,9 +90,9 @@ ecal_event (ECalendarItem *calitem, gpoi
e_calendar_item_get_selection (calitem, &start_date, &end_date);
- tt.year = g_date_year (&start_date);
- tt.month = g_date_month (&start_date);
- tt.day = g_date_day (&start_date);
+ tt.year = g_date_get_year (&start_date);
+ tt.month = g_date_get_month (&start_date);
+ tt.day = g_date_get_day (&start_date);
et = icaltime_as_timet_with_zone (tt, gnome_calendar_get_timezone (dlg->gcal));
Index: gui/itip-bonobo-control.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/itip-bonobo-control.c,v
retrieving revision 1.15
diff -u -p -r1.15 itip-bonobo-control.c
--- gui/itip-bonobo-control.c 1 Dec 2003 22:14:20 -0000 1.15
+++ gui/itip-bonobo-control.c 29 Sep 2004 20:10:01 -0000
@@ -121,8 +121,8 @@ pstream_load (BonoboPersistStream *ps, c
EItipControl *itip = data;
idle_data *id;
- if (type && g_strcasecmp (type, "text/calendar") != 0 &&
- g_strcasecmp (type, "text/x-calendar") != 0) {
+ if (type && g_ascii_strcasecmp (type, "text/calendar") != 0 &&
+ g_ascii_strcasecmp (type, "text/x-calendar") != 0) {
bonobo_exception_set (ev, ex_Bonobo_Persist_WrongDataType);
return;
}
@@ -150,8 +150,8 @@ pstream_save (BonoboPersistStream *ps, c
gchar *text;
gint len;
- if (type && g_strcasecmp (type, "text/calendar") != 0 &&
- g_strcasecmp (type, "text/x-calendar") != 0) {
+ if (type && g_ascii_strcasecmp (type, "text/calendar") != 0 &&
+ g_ascii_strcasecmp (type, "text/x-calendar") != 0) {
bonobo_exception_set (ev, ex_Bonobo_Persist_WrongDataType);
return;
}
Index: gui/itip-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/itip-utils.c,v
retrieving revision 1.92
diff -u -p -r1.92 itip-utils.c
--- gui/itip-utils.c 27 Sep 2004 14:14:11 -0000 1.92
+++ gui/itip-utils.c 29 Sep 2004 20:10:01 -0000
@@ -106,7 +106,7 @@ itip_organizer_is_user (ECalComponent *c
if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) {
char *email;
- if (e_cal_get_cal_address (client, &email, NULL) && !g_strcasecmp (email, strip)) {
+ if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
g_free (email);
return TRUE;
@@ -146,7 +146,7 @@ itip_strip_mailto (const gchar *address)
if (address == NULL)
return NULL;
- if (!g_strncasecmp (address, "mailto:";, 7))
+ if (!g_ascii_strncasecmp (address, "mailto:";, 7))
address += 7;
return address;
@@ -243,7 +243,7 @@ users_has_attendee (GList *users, const
GList *l;
for (l = users; l != NULL; l = l->next) {
- if (!g_strcasecmp (address, l->data))
+ if (!g_ascii_strcasecmp (address, l->data))
return TRUE;
}
@@ -325,7 +325,7 @@ comp_to_list (ECalComponentItipMethod me
if (users_has_attendee (users, att->value))
continue;
- else if (!g_strcasecmp (att->value, organizer.value))
+ else if (!g_ascii_strcasecmp (att->value, organizer.value))
continue;
recipient = &(to_list->_buffer[to_list->_length]);
Index: gui/print.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/print.c,v
retrieving revision 1.69
diff -u -p -r1.69 print.c
--- gui/print.c 26 Mar 2004 20:38:03 -0000 1.69
+++ gui/print.c 29 Sep 2004 20:10:02 -0000
@@ -1913,7 +1913,7 @@ range_selector_new (GtkWidget *dialog, t
e_utf8_strftime (text, sizeof (text), _("Selected day (%a %b %d %Y)"), &tm);
radio = gtk_radio_button_new_with_label (NULL, text);
- group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
+ group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio));
gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
/* Week */
@@ -1951,21 +1951,21 @@ range_selector_new (GtkWidget *dialog, t
g_snprintf (text, sizeof (text), _("Selected week (%s - %s)"), str1, str2);
radio = gtk_radio_button_new_with_label (group, text);
- group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
+ group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio));
gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
/* Month */
e_utf8_strftime (text, sizeof (text), _("Selected month (%b %Y)"), &tm);
radio = gtk_radio_button_new_with_label (group, text);
- group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
+ group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio));
gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
/* Year */
e_utf8_strftime (text, sizeof (text), _("Selected year (%Y)"), &tm);
radio = gtk_radio_button_new_with_label (group, text);
- group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
+ group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio));
gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
/* Select default */
Index: gui/weekday-picker.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/weekday-picker.c,v
retrieving revision 1.18
diff -u -p -r1.18 weekday-picker.c
--- gui/weekday-picker.c 10 Dec 2003 02:52:13 -0000 1.18
+++ gui/weekday-picker.c 29 Sep 2004 20:10:02 -0000
@@ -99,12 +99,13 @@ weekday_picker_class_init (WeekdayPicker
parent_class = g_type_class_peek_parent (class);
wp_signals[CHANGED] =
- gtk_signal_new ("changed",
- GTK_RUN_FIRST,
- G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (WeekdayPickerClass, changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (WeekdayPickerClass, changed),
+ NULL, NULL,
+ gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
object_class->destroy = weekday_picker_destroy;
@@ -372,9 +373,6 @@ configure_items (WeekdayPicker *wp)
c = get_day_text (day);
gnome_canvas_item_set (priv->labels[i],
"text", c,
-#if 0
- "font_gdk", gtk_style_get_font (gtk_widget_get_style (GTK_WIDGET (wp))),
-#endif
"x", (double) (i * box_width) + box_width / 2.0,
"y", (double) (1 + PADDING),
"anchor", GTK_ANCHOR_N,
Index: gui/dialogs/comp-editor-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor-page.c,v
retrieving revision 1.26
diff -u -p -r1.26 comp-editor-page.c
--- gui/dialogs/comp-editor-page.c 8 Jun 2004 16:44:46 -0000 1.26
+++ gui/dialogs/comp-editor-page.c 29 Sep 2004 20:10:02 -0000
@@ -182,7 +182,7 @@ comp_editor_page_destroy (GtkObject *obj
}
if (page->accel_group) {
- gtk_accel_group_unref (page->accel_group);
+ g_object_unref (page->accel_group);
page->accel_group = NULL;
}
Index: gui/dialogs/comp-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor.c,v
retrieving revision 1.109
diff -u -p -r1.109 comp-editor.c
--- gui/dialogs/comp-editor.c 6 Aug 2004 10:05:23 -0000 1.109
+++ gui/dialogs/comp-editor.c 29 Sep 2004 20:10:02 -0000
@@ -820,7 +820,7 @@ comp_editor_show_page (CompEditor *edito
page_widget = comp_editor_page_get_widget (page);
page_num = gtk_notebook_page_num (priv->notebook, page_widget);
- gtk_notebook_set_page (priv->notebook, page_num);
+ gtk_notebook_set_current_page (priv->notebook, page_num);
}
/**
Index: gui/dialogs/event-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.c,v
retrieving revision 1.73
diff -u -p -r1.73 event-page.c
--- gui/dialogs/event-page.c 7 Aug 2004 22:32:15 -0000 1.73
+++ gui/dialogs/event-page.c 29 Sep 2004 20:10:02 -0000
@@ -282,11 +282,11 @@ set_all_day (EventPage *epage, gboolean
priv = epage->priv;
- gtk_signal_handler_block_by_data (GTK_OBJECT (priv->all_day_event),
- epage);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->all_day_event), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
e_dialog_toggle_set (priv->all_day_event, all_day);
- gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->all_day_event),
- epage);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->all_day_event), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
e_date_edit_set_show_time (E_DATE_EDIT (priv->start_time), !all_day);
e_date_edit_set_show_time (E_DATE_EDIT (priv->end_time), !all_day);
@@ -360,8 +360,8 @@ update_time (EventPage *epage, ECalCompo
if (all_day_event)
start_zone = end_zone = calendar_config_get_icaltimezone ();
- gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time),
- epage);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->start_time), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
g_signal_handlers_block_matched (priv->end_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
e_date_edit_set_date (E_DATE_EDIT (priv->start_time), start_tt->year,
@@ -374,15 +374,15 @@ update_time (EventPage *epage, ECalCompo
e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_time),
end_tt->hour, end_tt->minute);
- gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time),
- epage);
- gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time),
- epage);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->start_time), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->end_time), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
/* Set the timezones, and set sync_timezones to TRUE if both timezones
are the same. */
- gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_timezone),
- epage);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->start_timezone), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
g_signal_handlers_block_matched (priv->end_timezone, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->start_timezone),
@@ -390,10 +390,10 @@ update_time (EventPage *epage, ECalCompo
e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->end_timezone),
end_zone);
- gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_timezone),
- epage);
- gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_timezone),
- epage);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->start_timezone), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->end_timezone), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
priv->sync_timezones = (start_zone == end_zone) ? TRUE : FALSE;
@@ -413,17 +413,17 @@ clear_widgets (EventPage *epage)
gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)), "", 0);
/* Start and end times */
- gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time),
- epage);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->start_time), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
g_signal_handlers_block_matched (priv->end_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
e_date_edit_set_time (E_DATE_EDIT (priv->start_time), 0);
e_date_edit_set_time (E_DATE_EDIT (priv->end_time), 0);
- gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time),
- epage);
- gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time),
- epage);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->start_time), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->end_time), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
set_all_day (epage, FALSE);
@@ -1101,7 +1101,7 @@ get_widgets (EventPage *epage)
accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
if (accel_groups) {
page->accel_group = accel_groups->data;
- gtk_accel_group_ref (page->accel_group);
+ g_object_ref (page->accel_group);
}
gtk_widget_ref (priv->main);
@@ -1523,10 +1523,10 @@ all_day_event_toggled_cb (GtkWidget *tog
TRUE);
}
- gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time),
- epage);
- gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time),
- epage);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->start_time), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->end_time), 0,
+ epage, G_SIGNAL_MATCH_DATA, 1);
e_date_edit_set_date (E_DATE_EDIT (priv->start_time), start_tt.year,
start_tt.month, start_tt.day);
@@ -1538,10 +1538,10 @@ all_day_event_toggled_cb (GtkWidget *tog
e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_time),
end_tt.hour, end_tt.minute);
- gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time),
- epage);
- gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time),
- epage);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->start_time), 0,
+ epage, G_SIGNAL_MATCH_DATA, 2);
+ gtk_signal_compat_matched (GTK_OBJECT (priv->end_time), 0,
+ epage, G_SIGNAL_MATCH_DATA, 2);
/* Notify upstream */
notify_dates_changed (epage, &start_tt, &end_tt);
Index: gui/dialogs/meeting-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/meeting-page.c,v
retrieving revision 1.89
diff -u -p -r1.89 meeting-page.c
--- gui/dialogs/meeting-page.c 20 Sep 2004 07:59:24 -0000 1.89
+++ gui/dialogs/meeting-page.c 29 Sep 2004 20:10:02 -0000
@@ -502,7 +502,7 @@ get_widgets (MeetingPage *mpage)
accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
if (accel_groups) {
page->accel_group = accel_groups->data;
- gtk_accel_group_ref (page->accel_group);
+ g_object_ref (page->accel_group);
}
gtk_widget_ref (priv->main);
Index: gui/dialogs/recurrence-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/recurrence-page.c,v
retrieving revision 1.60
diff -u -p -r1.60 recurrence-page.c
--- gui/dialogs/recurrence-page.c 5 Sep 2004 13:25:03 -0000 1.60
+++ gui/dialogs/recurrence-page.c 29 Sep 2004 20:10:03 -0000
@@ -1931,7 +1931,7 @@ get_widgets (RecurrencePage *rpage)
accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
if (accel_groups) {
page->accel_group = accel_groups->data;
- gtk_accel_group_ref (page->accel_group);
+ g_object_ref (page->accel_group);
}
gtk_widget_ref (priv->main);
Index: gui/dialogs/schedule-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/schedule-page.c,v
retrieving revision 1.31
diff -u -p -r1.31 schedule-page.c
--- gui/dialogs/schedule-page.c 16 Jul 2004 02:28:21 -0000 1.31
+++ gui/dialogs/schedule-page.c 29 Sep 2004 20:10:03 -0000
@@ -388,7 +388,7 @@ get_widgets (SchedulePage *spage)
accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
if (accel_groups) {
page->accel_group = accel_groups->data;
- gtk_accel_group_ref (page->accel_group);
+ g_object_ref (page->accel_group);
}
gtk_widget_ref (priv->main);
Index: gui/dialogs/task-details-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-details-page.c,v
retrieving revision 1.42
diff -u -p -r1.42 task-details-page.c
--- gui/dialogs/task-details-page.c 22 Jul 2004 13:02:55 -0000 1.42
+++ gui/dialogs/task-details-page.c 29 Sep 2004 20:10:03 -0000
@@ -505,7 +505,7 @@ get_widgets (TaskDetailsPage *tdpage)
accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
if (accel_groups) {
page->accel_group = accel_groups->data;
- gtk_accel_group_ref (page->accel_group);
+ g_object_ref (page->accel_group);
}
gtk_widget_ref (priv->main);
Index: gui/dialogs/task-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-page.c,v
retrieving revision 1.65
diff -u -p -r1.65 task-page.c
--- gui/dialogs/task-page.c 20 Sep 2004 07:35:35 -0000 1.65
+++ gui/dialogs/task-page.c 29 Sep 2004 20:10:03 -0000
@@ -649,7 +649,7 @@ get_widgets (TaskPage *tpage)
accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
if (accel_groups) {
page->accel_group = accel_groups->data;
- gtk_accel_group_ref (page->accel_group);
+ g_object_ref (page->accel_group);
}
gtk_widget_ref (priv->main);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
