diff options
Diffstat (limited to 'calendar/gui/e-meeting-time-sel.c')
| -rw-r--r-- | calendar/gui/e-meeting-time-sel.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 4744ab2e74..213882fadd 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -224,12 +224,13 @@ e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass) 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; @@ -688,7 +689,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em e_meeting_time_selector_update_end_date_edit (mts); e_meeting_time_selector_update_date_popup_menus (mts); - gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]); + g_signal_emit (mts, mts_signals [CHANGED], 0); } @@ -707,7 +708,7 @@ e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts, darea = gtk_drawing_area_new (); gtk_box_pack_start (GTK_BOX (child_hbox), darea, FALSE, FALSE, 0); - gtk_object_set_user_data (GTK_OBJECT (darea), mts); + g_object_set_data (G_OBJECT (darea), "data", mts); gtk_widget_set_size_request (darea, 14, 14); gtk_widget_show (darea); @@ -730,7 +731,7 @@ e_meeting_time_selector_expose_key_color (GtkWidget *darea, GdkGC *gc; gint width, height; - mts = gtk_object_get_user_data (GTK_OBJECT (darea)); + mts = g_object_get_data (G_OBJECT (darea), "data"); gc = mts->color_key_gc; width = darea->allocation.width; height = darea->allocation.height; @@ -1112,7 +1113,7 @@ e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts, e_meeting_time_selector_update_start_date_edit (mts); e_meeting_time_selector_update_end_date_edit (mts); - gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]); + g_signal_emit (mts, mts_signals [CHANGED], 0); return TRUE; } @@ -1240,7 +1241,7 @@ e_meeting_time_selector_refresh_cb (gpointer data) if (mts->display_main != NULL) gtk_widget_queue_draw (mts->display_main); - gtk_object_unref (GTK_OBJECT (mts)); + g_object_unref (GTK_OBJECT (mts)); return FALSE; } @@ -1273,9 +1274,9 @@ e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, int row, g int i; for (i = 0; i < e_meeting_store_count_actual_attendees (mts->model); i++) - gtk_object_ref (GTK_OBJECT (mts)); + g_object_ref (GTK_OBJECT (mts)); } else { - gtk_object_ref (GTK_OBJECT (mts)); + g_object_ref (GTK_OBJECT (mts)); } if (all) @@ -1671,7 +1672,7 @@ e_meeting_time_selector_autopick (EMeetingTimeSelector *mts, e_meeting_time_selector_update_start_date_edit (mts); e_meeting_time_selector_update_end_date_edit (mts); - gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]); + g_signal_emit (mts, mts_signals [CHANGED], 0); return; } @@ -2237,7 +2238,7 @@ e_meeting_time_selector_on_start_time_changed (GtkWidget *widget, gtk_widget_queue_draw (mts->display_top); gtk_widget_queue_draw (mts->display_main); - gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]); + g_signal_emit (mts, mts_signals [CHANGED], 0); } @@ -2287,7 +2288,7 @@ e_meeting_time_selector_on_end_time_changed (GtkWidget *widget, gtk_widget_queue_draw (mts->display_top); gtk_widget_queue_draw (mts->display_main); - gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]); + g_signal_emit (mts, mts_signals [CHANGED], 0); } @@ -2494,7 +2495,7 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts, if (set_both_times || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START) - gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]); + g_signal_emit (mts, mts_signals [CHANGED], 0); } @@ -2634,7 +2635,7 @@ e_meeting_time_selector_timeout_handler (gpointer data) if (set_both_times || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START) - gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]); + g_signal_emit (mts, mts_signals [CHANGED], 0); scroll: /* Redraw the canvases. We freeze and thaw the layouts so that they |