From 0af3ff804c0d71c76fd63f0a2a152cac7de64863 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 13 Jan 2011 10:54:58 -0500 Subject: Fudge gtk_widget_get_preferred_size() for gtk2. Easy enough to fake gtk_widget_get_preferred_size() in gtk2 using gtk_widget_size_request(). Reduces diff noise with gtk3 branch. --- calendar/gui/e-meeting-time-sel.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 4b2ccfc67f..8b6f36da6b 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -46,6 +46,9 @@ #include "e-meeting-list-view.h" #include "e-meeting-time-sel-item.h" +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + #define E_MEETING_TIME_SELECTOR_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MEETING_TIME_SELECTOR, EMeetingTimeSelectorPrivate)) @@ -1741,7 +1744,7 @@ e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu, *y += allocation.y + allocation.height - 2; /* Now make sure we are on the screen. */ - gtk_widget_size_request (mts->options_menu, &menu_requisition); + gtk_widget_get_preferred_size (mts->options_menu, &menu_requisition, NULL); max_x = MAX (0, gdk_screen_width () - menu_requisition.width); max_y = MAX (0, gdk_screen_height () - menu_requisition.height); *x = CLAMP (*x, 0, max_x); @@ -1794,7 +1797,7 @@ e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu, *y += allocation.y + allocation.height - 2; /* Now make sure we are on the screen. */ - gtk_widget_size_request (mts->autopick_menu, &menu_requisition); + gtk_widget_get_preferred_size (mts->autopick_menu, &menu_requisition, NULL); max_x = MAX (0, gdk_screen_width () - menu_requisition.width); max_y = MAX (0, gdk_screen_height () - menu_requisition.height); *x = CLAMP (*x, 0, max_x); -- cgit From d47adb5922a262effdd14c1c50bb0a3660088798 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 13 Jan 2011 17:16:57 -0500 Subject: Fudge GtkScrollable for gtk2. Yes, the GtkScrollable interface is implemented by more than just GtkLayout, but it turns out GtkLayout is the only thing Evolution uses the GtkScrollable API for on the gtk3 branch. --- calendar/gui/e-meeting-time-sel.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 8b6f36da6b..14f05c5bc7 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -399,7 +399,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em GtkWidget *alignment, *child_hbox, *arrow, *menuitem; GtkWidget *child; GtkAdjustment *adjustment; - GtkLayout *layout; + GtkScrollable *scrollable; GSList *group; guint accel_key; time_t meeting_start_time; @@ -508,13 +508,13 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em g_signal_connect (mts->display_main, "scroll-event", G_CALLBACK (e_meeting_time_selector_on_canvas_scroll_event), mts); - layout = GTK_LAYOUT (mts->display_main); + scrollable = GTK_SCROLLABLE (mts->display_main); - adjustment = gtk_layout_get_vadjustment (layout); + adjustment = gtk_scrollable_get_vadjustment (scrollable); gtk_scrolled_window_set_vadjustment ( GTK_SCROLLED_WINDOW (sw), adjustment); - adjustment = gtk_layout_get_hadjustment (layout); + adjustment = gtk_scrollable_get_hadjustment (scrollable); mts->hscrollbar = gtk_hscrollbar_new (adjustment); gtk_adjustment_set_step_increment (adjustment, mts->day_width); gtk_table_attach ( @@ -522,7 +522,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em 1, 4, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0); gtk_widget_show (mts->hscrollbar); - adjustment = gtk_layout_get_vadjustment (layout); + adjustment = gtk_scrollable_get_vadjustment (scrollable); mts->vscrollbar = gtk_vscrollbar_new (adjustment); gtk_adjustment_set_step_increment (adjustment, mts->row_height); gtk_table_attach ( @@ -842,12 +842,12 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em e_meeting_time_selector_alloc_named_color (mts, "orange4", &mts->busy_colors[E_MEETING_FREE_BUSY_OUT_OF_OFFICE]); /* Connect handlers to the adjustments scroll the other items. */ - layout = GTK_LAYOUT (mts->display_main); - adjustment = gtk_layout_get_hadjustment (layout); + scrollable = GTK_SCROLLABLE (mts->display_main); + adjustment = gtk_scrollable_get_hadjustment (scrollable); g_signal_connect ( adjustment, "value_changed", G_CALLBACK (e_meeting_time_selector_hadjustment_changed), mts); - adjustment = gtk_layout_get_vadjustment (layout); + adjustment = gtk_scrollable_get_vadjustment (scrollable); g_signal_connect ( adjustment, "value_changed", G_CALLBACK (e_meeting_time_selector_vadjustment_changed), mts); @@ -1182,10 +1182,10 @@ style_change_idle_func (EMeetingTimeSelector *mts) widget = mts->display_main; - adjustment = gtk_layout_get_hadjustment (GTK_LAYOUT (widget)); + adjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (widget)); gtk_adjustment_set_step_increment (adjustment, mts->day_width); - adjustment = gtk_layout_get_vadjustment (GTK_LAYOUT (widget)); + adjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (widget)); gtk_adjustment_set_step_increment (adjustment, mts->row_height); g_object_unref (layout); @@ -1256,11 +1256,11 @@ e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment, EMeetingTimeSelector *mts) { GtkAdjustment *hadjustment; - GtkLayout *layout; + GtkScrollable *scrollable; gdouble value; - layout = GTK_LAYOUT (mts->display_top); - hadjustment = gtk_layout_get_hadjustment (layout); + scrollable = GTK_SCROLLABLE (mts->display_top); + hadjustment = gtk_scrollable_get_hadjustment (scrollable); value = gtk_adjustment_get_value (adjustment); gtk_adjustment_set_value (hadjustment, value); -- cgit From 753c60fc67a0a56a5f119c14ffa54ea9af95c208 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 9 Nov 2010 08:48:33 -0500 Subject: Drop backward-compatibility cruft. --- calendar/gui/e-meeting-time-sel.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 14f05c5bc7..61ef52f47f 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -46,9 +46,6 @@ #include "e-meeting-list-view.h" #include "e-meeting-time-sel-item.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_MEETING_TIME_SELECTOR_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MEETING_TIME_SELECTOR, EMeetingTimeSelectorPrivate)) -- cgit From dc300e6bc814acbfe2fb18f2a2219afdd4fc1a59 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 13 Jan 2011 23:02:52 -0500 Subject: gdk_cursor_unref() -> g_object_unref() --- calendar/gui/e-meeting-time-sel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 61ef52f47f..d68c369270 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -1467,7 +1467,7 @@ e_meeting_time_selector_refresh_cb (gpointer data) window = gtk_widget_get_window (GTK_WIDGET (mts)); if (window) gdk_window_set_cursor (window, cursor); - gdk_cursor_unref (cursor); + g_object_unref (cursor); mts->last_cursor_set = GDK_LEFT_PTR; @@ -1515,7 +1515,7 @@ e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, gint row, cursor = gdk_cursor_new (GDK_WATCH); window = gtk_widget_get_window (GTK_WIDGET (mts)); gdk_window_set_cursor (window, cursor); - gdk_cursor_unref (cursor); + g_object_unref (cursor); mts->last_cursor_set = GDK_WATCH; } -- cgit From 105086680b80db723c940f28eaaa1d38284cd246 Mon Sep 17 00:00:00 2001 From: Vibha Yadav Date: Thu, 2 Dec 2010 17:12:19 +0530 Subject: Adapt EMeetingTimeSel to latest gtk+-3.0 API. --- calendar/gui/e-meeting-time-sel.c | 61 +++++++++++++++------------------------ 1 file changed, 24 insertions(+), 37 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index d68c369270..d694a4a6fe 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -104,8 +104,8 @@ static void e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts, GtkWidget *hbox, gchar *label_text, GdkColor *color); -static gint e_meeting_time_selector_expose_key_color (GtkWidget *darea, - GdkEventExpose *event, +static gint e_meeting_time_selector_draw_key_color (GtkWidget *darea, + cairo_t *cr, GdkColor *color); static void e_meeting_time_selector_options_menu_detacher (GtkWidget *widget, GtkMenu *menu); @@ -115,9 +115,8 @@ static void e_meeting_time_selector_realize (GtkWidget *widget); static void e_meeting_time_selector_unrealize (GtkWidget *widget); static void e_meeting_time_selector_style_set (GtkWidget *widget, GtkStyle *previous_style); -static gint e_meeting_time_selector_expose_event (GtkWidget *widget, - GdkEventExpose *event); -static void e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts); +static gint e_meeting_time_selector_draw (GtkWidget *widget, cairo_t *cr); +static void e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts, cairo_t *cr); static void e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment, EMeetingTimeSelector *mts); static void e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment, @@ -319,7 +318,7 @@ e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * class) widget_class->realize = e_meeting_time_selector_realize; widget_class->unrealize = e_meeting_time_selector_unrealize; widget_class->style_set = e_meeting_time_selector_style_set; - widget_class->expose_event = e_meeting_time_selector_expose_event; + widget_class->draw = e_meeting_time_selector_draw; g_object_class_install_property ( object_class, @@ -885,35 +884,28 @@ e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts, gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 6); gtk_widget_show (label); - g_signal_connect (darea, "expose_event", - G_CALLBACK (e_meeting_time_selector_expose_key_color), + g_signal_connect (darea, "draw", + G_CALLBACK (e_meeting_time_selector_draw_key_color), color); } static gint -e_meeting_time_selector_expose_key_color (GtkWidget *darea, - GdkEventExpose *event, - GdkColor *color) +e_meeting_time_selector_draw_key_color (GtkWidget *darea, cairo_t *cr, GdkColor *color) { EMeetingTimeSelector * mts; GtkAllocation allocation; - GdkWindow *window; GtkStyle *style; - cairo_t *cr; style = gtk_widget_get_style (darea); - window = gtk_widget_get_window (darea); gtk_widget_get_allocation (darea, &allocation); mts = g_object_get_data (G_OBJECT (darea), "data"); gtk_paint_shadow ( - style, window, GTK_STATE_NORMAL, - GTK_SHADOW_IN, NULL, NULL, NULL, 0, 0, + style, cr, GTK_STATE_NORMAL, + GTK_SHADOW_IN, NULL, NULL, 0, 0, allocation.width, allocation.height); - cr = gdk_cairo_create (event->window); - if (color) { gdk_cairo_set_source_color (cr, color); } else { @@ -924,8 +916,6 @@ e_meeting_time_selector_expose_key_color (GtkWidget *darea, allocation.width - 2, allocation.height - 2); cairo_fill (cr); - cairo_destroy (cr); - return TRUE; } @@ -933,15 +923,11 @@ static void e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts, const gchar *name, GdkColor *c) { - GdkColormap *colormap; - g_return_if_fail (name != NULL); g_return_if_fail (c != NULL); - gdk_color_parse (name, c); - colormap = gtk_widget_get_colormap (GTK_WIDGET (mts)); - if (!gdk_colormap_alloc_color (colormap, c, TRUE, TRUE)) - g_warning ("Failed to allocate color: %s\n", name); + if ( !gdk_color_parse (name, c)) + g_warning ("Failed to parse color: %s\n", name); } static void @@ -1209,29 +1195,29 @@ e_meeting_time_selector_style_set (GtkWidget *widget, /* This draws a shadow around the top display and main display. */ static gint -e_meeting_time_selector_expose_event (GtkWidget *widget, - GdkEventExpose *event) +e_meeting_time_selector_draw (GtkWidget *widget, cairo_t *cr) { EMeetingTimeSelector *mts; mts = E_MEETING_TIME_SELECTOR (widget); - e_meeting_time_selector_draw_shadow (mts); + e_meeting_time_selector_draw_shadow (mts, cr); - if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->expose_event) - (*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->expose_event)(widget, event); + if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->draw) + (*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->draw)(widget, cr); return FALSE; } static void -e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts) +e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts, cairo_t *cr) { GtkAllocation allocation; - GdkWindow *window; GtkStyle *style; gint x, y, w, h; + cairo_save (cr); + /* Draw the shadow around the graphical displays. */ gtk_widget_get_allocation (mts->display_top, &allocation); x = allocation.x - 2; @@ -1240,11 +1226,12 @@ e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts) h = allocation.height + allocation.height + 4; style = gtk_widget_get_style (GTK_WIDGET (mts)); - window = gtk_widget_get_window (GTK_WIDGET (mts)); gtk_paint_shadow ( - style, window, GTK_STATE_NORMAL, - GTK_SHADOW_IN, NULL, NULL, NULL, x, y, w, h); + style, cr, GTK_STATE_NORMAL, + GTK_SHADOW_IN, NULL, NULL, x, y, w, h); + + cairo_restore (cr); } /* When the main canvas scrolls, we scroll the other canvases. */ @@ -2451,7 +2438,7 @@ e_meeting_time_selector_on_canvas_realized (GtkWidget *widget, GdkWindow *window; window = gtk_layout_get_bin_window (GTK_LAYOUT (widget)); - gdk_window_set_back_pixmap (window, NULL, FALSE); + gdk_window_set_background_pattern (window, NULL); } /* This is called when the meeting start time GnomeDateEdit is changed, -- cgit From 0109aa3a92b484ebb85c6481e5a8e39819b1f011 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 30 Jan 2011 11:32:55 -0500 Subject: More whitespace cleanup. --- calendar/gui/e-meeting-time-sel.c | 58 +++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index d694a4a6fe..ef221c4288 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -909,12 +909,12 @@ e_meeting_time_selector_draw_key_color (GtkWidget *darea, cairo_t *cr, GdkColor if (color) { gdk_cairo_set_source_color (cr, color); } else { - cairo_set_source (cr, mts->no_info_pattern); + cairo_set_source (cr, mts->no_info_pattern); } - cairo_rectangle (cr, - 1, 1, - allocation.width - 2, allocation.height - 2); - cairo_fill (cr); + cairo_rectangle (cr, + 1, 1, + allocation.width - 2, allocation.height - 2); + cairo_fill (cr); return TRUE; } @@ -1032,35 +1032,35 @@ e_meeting_time_selector_set_week_start_day (EMeetingTimeSelector *mts, static cairo_pattern_t * e_meeting_time_selector_create_no_info_pattern (EMeetingTimeSelector *mts) { - cairo_surface_t *surface; - cairo_pattern_t *pattern; - GdkColor color; - cairo_t *cr; + cairo_surface_t *surface; + cairo_pattern_t *pattern; + GdkColor color; + cairo_t *cr; - surface = gdk_window_create_similar_surface (gtk_widget_get_window (GTK_WIDGET (mts)), - CAIRO_CONTENT_COLOR, 8, 8); - cr = cairo_create (surface); + surface = gdk_window_create_similar_surface (gtk_widget_get_window (GTK_WIDGET (mts)), + CAIRO_CONTENT_COLOR, 8, 8); + cr = cairo_create (surface); gdk_color_parse ("white", &color); - gdk_cairo_set_source_color (cr, &color); - cairo_paint (cr); + gdk_cairo_set_source_color (cr, &color); + cairo_paint (cr); - gdk_cairo_set_source_color (cr, &mts->grid_color); - cairo_set_line_width (cr, 1.0); - cairo_move_to (cr, -1, 5); - cairo_line_to (cr, 9, -5); - cairo_move_to (cr, -1, 13); - cairo_line_to (cr, 9, 3); - cairo_stroke (cr); + gdk_cairo_set_source_color (cr, &mts->grid_color); + cairo_set_line_width (cr, 1.0); + cairo_move_to (cr, -1, 5); + cairo_line_to (cr, 9, -5); + cairo_move_to (cr, -1, 13); + cairo_line_to (cr, 9, 3); + cairo_stroke (cr); - cairo_destroy (cr); + cairo_destroy (cr); - pattern = cairo_pattern_create_for_surface (surface); - cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); + pattern = cairo_pattern_create_for_surface (surface); + cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); - cairo_surface_destroy (surface); + cairo_surface_destroy (surface); - return pattern; + return pattern; } static void @@ -1075,7 +1075,7 @@ e_meeting_time_selector_realize (GtkWidget *widget) mts = E_MEETING_TIME_SELECTOR (widget); window = gtk_widget_get_window (widget); - mts->no_info_pattern = e_meeting_time_selector_create_no_info_pattern (mts); + mts->no_info_pattern = e_meeting_time_selector_create_no_info_pattern (mts); } static void @@ -1085,8 +1085,8 @@ e_meeting_time_selector_unrealize (GtkWidget *widget) mts = E_MEETING_TIME_SELECTOR (widget); - cairo_pattern_destroy (mts->no_info_pattern); - mts->no_info_pattern = NULL; + cairo_pattern_destroy (mts->no_info_pattern); + mts->no_info_pattern = NULL; if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize) (*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize)(widget); -- cgit From 2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Tue, 8 Feb 2011 11:57:50 -0500 Subject: Bug 641756 - Fix warnings from GCC 4.6 GCC learned how to find dead assignments. --- calendar/gui/e-meeting-time-sel.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index ef221c4288..7e405d1f36 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -1067,14 +1067,12 @@ static void e_meeting_time_selector_realize (GtkWidget *widget) { EMeetingTimeSelector *mts; - GdkWindow *window; if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->realize) (*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->realize)(widget); mts = E_MEETING_TIME_SELECTOR (widget); - window = gtk_widget_get_window (widget); mts->no_info_pattern = e_meeting_time_selector_create_no_info_pattern (mts); } -- cgit From 7a1677520d439aee68c5ab0268a951d0b411e3a0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 12 Feb 2011 11:37:05 -0500 Subject: Remove NULL checks for GObject methods. As of GLib 2.28 all GObject virtual methods, including constructed(), are safe to chain up to unconditionally. Remove unnecessary checks. --- calendar/gui/e-meeting-time-sel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 7e405d1f36..1e9ddf97b6 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -297,8 +297,8 @@ meeting_time_selector_dispose (GObject *object) mts->style_change_idle_id = 0; } - if (G_OBJECT_CLASS (e_meeting_time_selector_parent_class)->dispose) - G_OBJECT_CLASS (e_meeting_time_selector_parent_class)->dispose (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (e_meeting_time_selector_parent_class)->dispose (object); } static void -- cgit From 1301cf02efdacd20fb5ce3e2554ae15b8f146e8a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 25 Feb 2011 16:20:41 +0100 Subject: Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly --- calendar/gui/e-meeting-time-sel.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 1e9ddf97b6..ce7587049d 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -46,10 +46,6 @@ #include "e-meeting-list-view.h" #include "e-meeting-time-sel-item.h" -#define E_MEETING_TIME_SELECTOR_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_MEETING_TIME_SELECTOR, EMeetingTimeSelectorPrivate)) - struct _EMeetingTimeSelectorPrivate { gint week_start_day; guint show_week_numbers : 1; @@ -365,7 +361,7 @@ e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * class) static void e_meeting_time_selector_init (EMeetingTimeSelector * mts) { - mts->priv = E_MEETING_TIME_SELECTOR_GET_PRIVATE (mts); + mts->priv = G_TYPE_INSTANCE_GET_PRIVATE (mts, E_TYPE_MEETING_TIME_SELECTOR, EMeetingTimeSelectorPrivate); /* The shadow is drawn in the border so it must be >= 2 pixels. */ gtk_container_set_border_width (GTK_CONTAINER (mts), 2); -- cgit From c6fd77460f5baf88528f5da2ffb99e86a2885ff0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 5 Mar 2011 12:33:49 -0500 Subject: Coding style and whitespace cleanup. --- calendar/gui/e-meeting-time-sel.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index ce7587049d..ebe9bd05c0 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -361,7 +361,9 @@ e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * class) static void e_meeting_time_selector_init (EMeetingTimeSelector * mts) { - mts->priv = G_TYPE_INSTANCE_GET_PRIVATE (mts, E_TYPE_MEETING_TIME_SELECTOR, EMeetingTimeSelectorPrivate); + mts->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + mts, E_TYPE_MEETING_TIME_SELECTOR, + EMeetingTimeSelectorPrivate); /* The shadow is drawn in the border so it must be >= 2 pixels. */ gtk_container_set_border_width (GTK_CONTAINER (mts), 2); -- cgit From fcbbdfbd18e15b4ee8322a0217cf03a689a5e033 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 16 Aug 2011 11:25:56 -0400 Subject: Coding style and whitespace cleanup. --- calendar/gui/e-meeting-time-sel.c | 454 +++++++++++++++++++------------------- 1 file changed, 233 insertions(+), 221 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index ebe9bd05c0..9afdfd7a22 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -74,7 +74,7 @@ const gchar *EMeetingTimeSelectorHours12[24] = { #define E_MEETING_TIME_SELECTOR_FB_DAYS_AFTER 28 /* This is the number of pixels between the mouse has to move before the - scroll speed is incremented. */ + * scroll speed is incremented. */ #define E_MEETING_TIME_SELECTOR_SCROLL_INCREMENT_WIDTH 10 /* This is the maximum scrolling speed. */ @@ -150,22 +150,22 @@ static void e_meeting_time_selector_on_next_button_clicked (GtkWidget *button, EMeetingTimeSelector *mts); static void e_meeting_time_selector_autopick (EMeetingTimeSelector *mts, gboolean forward); -static void e_meeting_time_selector_calculate_time_difference (EMeetingTime*start, - EMeetingTime*end, +static void e_meeting_time_selector_calculate_time_difference (EMeetingTime *start, + EMeetingTime *end, gint *days, gint *hours, gint *minutes); static void e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts, - EMeetingTime*start_time, - EMeetingTime*end_time, + EMeetingTime *start_time, + EMeetingTime *end_time, gint days, gint hours, gint mins); static void e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mts, EMeetingTime *start_time, EMeetingTime *end_time, gint days, gint hours, gint mins); -static void e_meeting_time_selector_adjust_time (EMeetingTime*mtstime, +static void e_meeting_time_selector_adjust_time (EMeetingTime *mtstime, gint days, gint hours, gint minutes); -static EMeetingFreeBusyPeriod* e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts, +static EMeetingFreeBusyPeriod * e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts, EMeetingAttendee *attendee, EMeetingTime *start_time, EMeetingTime *end_time); @@ -175,7 +175,7 @@ static void e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mt static void e_meeting_time_selector_save_position (EMeetingTimeSelector *mts, EMeetingTime *mtstime); static void e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts, - EMeetingTime*mtstime); + EMeetingTime *mtstime); static void e_meeting_time_selector_on_start_time_changed (GtkWidget *widget, EMeetingTimeSelector *mts); static void e_meeting_time_selector_on_end_time_changed (GtkWidget *widget, @@ -298,7 +298,7 @@ meeting_time_selector_dispose (GObject *object) } static void -e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * class) +e_meeting_time_selector_class_init (EMeetingTimeSelectorClass *class) { GObjectClass *object_class; GtkWidgetClass *widget_class; @@ -359,7 +359,7 @@ e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * class) } static void -e_meeting_time_selector_init (EMeetingTimeSelector * mts) +e_meeting_time_selector_init (EMeetingTimeSelector *mts) { mts->priv = G_TYPE_INSTANCE_GET_PRIVATE ( mts, E_TYPE_MEETING_TIME_SELECTOR, @@ -387,7 +387,8 @@ e_meeting_time_selector_init (EMeetingTimeSelector * mts) } void -e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *ems) +e_meeting_time_selector_construct (EMeetingTimeSelector *mts, + EMeetingStore *ems) { GtkWidget *hbox, *vbox, *separator, *label, *table, *sw; GtkWidget *alignment, *child_hbox, *arrow, *menuitem; @@ -401,7 +402,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em AtkObject *a11y_label, *a11y_date_edit; /* The default meeting time is the nearest half-hour interval in the - future, in working hours. */ + * future, in working hours. */ meeting_start_time = time (NULL); g_date_clear (&mts->meeting_start_time.date, 1); g_date_set_time_t (&mts->meeting_start_time.date, meeting_start_time); @@ -859,11 +860,12 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em } /* This adds a color to the color key beneath the main display. If color is - NULL, it displays the No Info pattern instead. */ + * NULL, it displays the No Info pattern instead. */ static void -e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts, - GtkWidget *hbox, - gchar *label_text, GdkColor *color) +e_meeting_time_selector_add_key_color (EMeetingTimeSelector *mts, + GtkWidget *hbox, + gchar *label_text, + GdkColor *color) { GtkWidget *child_hbox, *darea, *label; @@ -888,7 +890,9 @@ e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts, } static gint -e_meeting_time_selector_draw_key_color (GtkWidget *darea, cairo_t *cr, GdkColor *color) +e_meeting_time_selector_draw_key_color (GtkWidget *darea, + cairo_t *cr, + GdkColor *color) { EMeetingTimeSelector * mts; GtkAllocation allocation; @@ -918,8 +922,9 @@ e_meeting_time_selector_draw_key_color (GtkWidget *darea, cairo_t *cr, GdkColor } static void -e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts, - const gchar *name, GdkColor *c) +e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector *mts, + const gchar *name, + GdkColor *c) { g_return_if_fail (name != NULL); g_return_if_fail (c != NULL); @@ -930,7 +935,7 @@ e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts, static void e_meeting_time_selector_options_menu_detacher (GtkWidget *widget, - GtkMenu *menu) + GtkMenu *menu) { EMeetingTimeSelector *mts; @@ -938,14 +943,14 @@ e_meeting_time_selector_options_menu_detacher (GtkWidget *widget, g_return_if_fail (E_IS_MEETING_TIME_SELECTOR (widget)); mts = E_MEETING_TIME_SELECTOR (widget); - g_return_if_fail (mts->options_menu == (GtkWidget*) menu); + g_return_if_fail (mts->options_menu == (GtkWidget *) menu); mts->options_menu = NULL; } static void e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget, - GtkMenu *menu) + GtkMenu *menu) { EMeetingTimeSelector *mts; @@ -953,7 +958,7 @@ e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget, g_return_if_fail (E_IS_MEETING_TIME_SELECTOR (widget)); mts = E_MEETING_TIME_SELECTOR (widget); - g_return_if_fail (mts->autopick_menu == (GtkWidget*) menu); + g_return_if_fail (mts->autopick_menu == (GtkWidget *) menu); mts->autopick_menu = NULL; } @@ -1149,12 +1154,12 @@ style_change_idle_func (EMeetingTimeSelector *mts) * FIXME: I can't find a way to get the treeview header heights * other than the below but it isn't nice to realize that widget here * - + * gtk_widget_realize (mts->list_view); gdk_window_get_position (gtk_tree_view_get_bin_window (GTK_TREE_VIEW (mts->list_view)), NULL, &maxheight); gtk_widget_set_size_request (mts->attendees_vbox_spacer, 1, mts->row_height * 3 - maxheight); - + * */ gtk_widget_set_size_request (mts->attendees_vbox_spacer, 1, mts->row_height * 2 - 6); @@ -1177,7 +1182,7 @@ style_change_idle_func (EMeetingTimeSelector *mts) static void e_meeting_time_selector_style_set (GtkWidget *widget, - GtkStyle *previous_style) + GtkStyle *previous_style) { EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (widget); @@ -1191,7 +1196,8 @@ e_meeting_time_selector_style_set (GtkWidget *widget, /* This draws a shadow around the top display and main display. */ static gint -e_meeting_time_selector_draw (GtkWidget *widget, cairo_t *cr) +e_meeting_time_selector_draw (GtkWidget *widget, + cairo_t *cr) { EMeetingTimeSelector *mts; @@ -1206,7 +1212,8 @@ e_meeting_time_selector_draw (GtkWidget *widget, cairo_t *cr) } static void -e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts, cairo_t *cr) +e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts, + cairo_t *cr) { GtkAllocation allocation; GtkStyle *style; @@ -1233,7 +1240,7 @@ e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts, cairo_t *cr) /* When the main canvas scrolls, we scroll the other canvases. */ static void e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { GtkAdjustment *hadjustment; GtkScrollable *scrollable; @@ -1248,7 +1255,7 @@ e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment, static void e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { GtkAdjustment *vadjustment; GtkTreeView *tree_view; @@ -1263,16 +1270,16 @@ e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment, void e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts, - gint *start_year, - gint *start_month, - gint *start_day, - gint *start_hour, - gint *start_minute, - gint *end_year, - gint *end_month, - gint *end_day, - gint *end_hour, - gint *end_minute) + gint *start_year, + gint *start_month, + gint *start_day, + gint *start_hour, + gint *start_minute, + gint *end_year, + gint *end_month, + gint *end_day, + gint *end_hour, + gint *end_minute) { *start_year = g_date_get_year (&mts->meeting_start_time.date); *start_month = g_date_get_month (&mts->meeting_start_time.date); @@ -1289,16 +1296,16 @@ e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts, gboolean e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts, - gint start_year, - gint start_month, - gint start_day, - gint start_hour, - gint start_minute, - gint end_year, - gint end_month, - gint end_day, - gint end_hour, - gint end_minute) + gint start_year, + gint start_month, + gint start_day, + gint start_hour, + gint start_minute, + gint end_year, + gint end_month, + gint end_day, + gint end_hour, + gint end_minute) { g_return_val_if_fail (E_IS_MEETING_TIME_SELECTOR (mts), FALSE); @@ -1336,7 +1343,7 @@ e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts, void e_meeting_time_selector_set_all_day (EMeetingTimeSelector *mts, - gboolean all_day) + gboolean all_day) { EMeetingTime saved_time; @@ -1358,7 +1365,7 @@ e_meeting_time_selector_set_all_day (EMeetingTimeSelector *mts, void e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts, - gboolean working_hours_only) + gboolean working_hours_only) { EMeetingTime saved_time; @@ -1380,10 +1387,10 @@ e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts, void e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts, - gint day_start_hour, - gint day_start_minute, - gint day_end_hour, - gint day_end_minute) + gint day_start_hour, + gint day_start_minute, + gint day_end_hour, + gint day_end_minute) { EMeetingTime saved_time; @@ -1418,7 +1425,7 @@ e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts, void e_meeting_time_selector_set_zoomed_out (EMeetingTimeSelector *mts, - gboolean zoomed_out) + gboolean zoomed_out) { EMeetingTime saved_time; @@ -1469,7 +1476,9 @@ e_meeting_time_selector_refresh_cb (gpointer data) } void -e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, gint row, gboolean all) +e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, + gint row, + gboolean all) { EMeetingTime start, end; @@ -1547,7 +1556,7 @@ e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts) void e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts, - EMeetingTimeSelectorAutopickOption autopick_option) + EMeetingTimeSelectorAutopickOption autopick_option) { g_return_if_fail (E_IS_MEETING_TIME_SELECTOR (mts)); @@ -1566,26 +1575,10 @@ e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts, break; } } -#if 0 -void -e_meeting_time_selector_attendee_set_send_meeting_to (EMeetingTimeSelector *mts, - gint row, - gboolean send_meeting_to) -{ - EMeetingTimeSelectorAttendee *attendee; - - g_return_if_fail (E_IS_MEETING_TIME_SELECTOR (mts)); - g_return_if_fail (row >= 0); - g_return_if_fail (row < mts->attendees->len); - - attendee = &g_array_index (mts->attendees, - EMeetingTimeSelectorAttendee, row); - attendee->send_meeting_to = send_meeting_to; -} -#endif void -e_meeting_time_selector_set_read_only (EMeetingTimeSelector *mts, gboolean read_only) +e_meeting_time_selector_set_read_only (EMeetingTimeSelector *mts, + gboolean read_only) { g_return_if_fail (E_IS_MEETING_TIME_SELECTOR (mts)); @@ -1651,9 +1644,9 @@ e_meeting_time_selector_dump (EMeetingTimeSelector *mts) } /* This formats a EMeetingTimein a string and returns it. - Note that it uses a static buffer. */ + * Note that it uses a static buffer. */ gchar * -e_meeting_time_selector_dump_time (EMeetingTime*mtstime) +e_meeting_time_selector_dump_time (EMeetingTime *mtstime) { static gchar buffer[128]; @@ -1670,7 +1663,7 @@ e_meeting_time_selector_dump_time (EMeetingTime*mtstime) } /* This formats a GDate in a string and returns it. - Note that it uses a static buffer. */ + * Note that it uses a static buffer. */ gchar * e_meeting_time_selector_dump_date (GDate *date) { @@ -1685,14 +1678,14 @@ e_meeting_time_selector_dump_date (GDate *date) static void e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { e_meeting_list_view_invite_others_dialog (mts->list_view); } static void e_meeting_time_selector_on_options_button_clicked (GtkWidget *button, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { gtk_menu_popup (GTK_MENU (mts->options_menu), NULL, NULL, e_meeting_time_selector_options_menu_position_callback, @@ -1701,10 +1694,10 @@ e_meeting_time_selector_on_options_button_clicked (GtkWidget *button, static void e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu, - gint *x, - gint *y, - gboolean *push_in, - gpointer user_data) + gint *x, + gint *y, + gboolean *push_in, + gpointer user_data) { EMeetingTimeSelector *mts; GtkRequisition menu_requisition; @@ -1733,10 +1726,10 @@ e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu, static void e_meeting_time_selector_on_update_free_busy (GtkWidget *button, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { /* Make sure the menu pops down, which doesn't happen by default if - keyboard accelerators are used. */ + * keyboard accelerators are used. */ if (gtk_widget_get_visible (mts->options_menu)) gtk_menu_popdown (GTK_MENU (mts->options_menu)); @@ -1745,7 +1738,7 @@ e_meeting_time_selector_on_update_free_busy (GtkWidget *button, static void e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { gtk_menu_popup (GTK_MENU (mts->autopick_menu), NULL, NULL, e_meeting_time_selector_autopick_menu_position_callback, @@ -1754,10 +1747,10 @@ e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button, static void e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu, - gint *x, - gint *y, - gboolean *push_in, - gpointer user_data) + gint *x, + gint *y, + gboolean *push_in, + gpointer user_data) { EMeetingTimeSelector *mts; GtkRequisition menu_requisition; @@ -1786,33 +1779,33 @@ e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu, static void e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { /* Make sure the menu pops down, which doesn't happen by default if - keyboard accelerators are used. */ + * keyboard accelerators are used. */ if (gtk_widget_get_visible (mts->autopick_menu)) gtk_menu_popdown (GTK_MENU (mts->autopick_menu)); } static void e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { e_meeting_time_selector_autopick (mts, FALSE); } static void e_meeting_time_selector_on_next_button_clicked (GtkWidget *button, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { e_meeting_time_selector_autopick (mts, TRUE); } /* This tries to find the previous or next meeting time for which all - attendees will be available. */ + * attendees will be available. */ static void e_meeting_time_selector_autopick (EMeetingTimeSelector *mts, - gboolean forward) + gboolean forward) { EMeetingTime start_time, end_time, *resource_free; EMeetingAttendee *attendee; @@ -1833,7 +1826,7 @@ e_meeting_time_selector_autopick (EMeetingTimeSelector *mts, e_meeting_time_selector_find_nearest_interval_backward (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes); /* Determine if we can skip optional people and if we only need one - resource based on the autopick option. */ + * resource based on the autopick option. */ autopick_option = e_meeting_time_selector_get_autopick_option (mts); if (autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE || autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE) @@ -1843,14 +1836,14 @@ e_meeting_time_selector_autopick (EMeetingTimeSelector *mts, need_one_resource = TRUE; /* Keep moving forward or backward until we find a possible meeting - time. */ + * time. */ for (;;) { meeting_time_ok = TRUE; found_resource = FALSE; resource_free = NULL; /* Step through each attendee, checking if the meeting time - intersects one of the attendees busy periods. */ + * intersects one of the attendees busy periods. */ for (row = 0; row < e_meeting_store_count_actual_attendees (mts->model); row++) { attendee = e_meeting_store_find_attendee_at_row (mts->model, row); @@ -1863,9 +1856,9 @@ e_meeting_time_selector_autopick (EMeetingTimeSelector *mts, if (need_one_resource && e_meeting_attendee_get_atype (attendee) == E_MEETING_ATTENDEE_RESOURCE) { if (period) { /* We want to remember the closest - prev/next time that one resource is - available, in case we don't find any - free resources. */ + * prev/next time that one resource is + * available, in case we don't find any + * free resources. */ if (forward) { if (!resource_free || e_meeting_time_compare_times (resource_free, &period->end) > 0) resource_free = &period->end; @@ -1891,9 +1884,9 @@ e_meeting_time_selector_autopick (EMeetingTimeSelector *mts, } /* Check that we found one resource if necessary. If not, skip - to the closest time that a resource is free. Note that if - there are no resources, resource_free will never get set, - so we assume the meeting time is OK. */ + * to the closest time that a resource is free. Note that if + * there are no resources, resource_free will never get set, + * so we assume the meeting time is OK. */ if (meeting_time_ok && need_one_resource && !found_resource && resource_free) { if (forward) { @@ -1933,11 +1926,11 @@ e_meeting_time_selector_autopick (EMeetingTimeSelector *mts, } static void -e_meeting_time_selector_calculate_time_difference (EMeetingTime*start, - EMeetingTime*end, - gint *days, - gint *hours, - gint *minutes) +e_meeting_time_selector_calculate_time_difference (EMeetingTime *start, + EMeetingTime *end, + gint *days, + gint *hours, + gint *minutes) { *days = g_date_get_julian (&end->date) - g_date_get_julian (&start->date); *hours = end->hour - start->hour; @@ -1953,12 +1946,14 @@ e_meeting_time_selector_calculate_time_difference (EMeetingTime*start, } /* This moves the given time forward to the next suitable start of a meeting. - If zoomed_out is set, this means every hour. If not every half-hour. */ + * If zoomed_out is set, this means every hour. If not every half-hour. */ static void e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts, - EMeetingTime*start_time, - EMeetingTime*end_time, - gint days, gint hours, gint mins) + EMeetingTime *start_time, + EMeetingTime *end_time, + gint days, + gint hours, + gint mins) { gint minutes_shown; gboolean set_to_start_of_working_day = FALSE; @@ -1982,7 +1977,7 @@ e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts, e_meeting_time_selector_adjust_time (end_time, days, hours, mins); /* Check if the interval is less than a day as seen in the display. - If it isn't we don't worry about the working day. */ + * If it isn't we don't worry about the working day. */ if (!mts->working_hours_only || days > 0) return; minutes_shown = (mts->day_end_hour - mts->day_start_hour) * 60; @@ -1991,8 +1986,8 @@ e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts, return; /* If the meeting time finishes past the end of the working day, move - onto the start of the next working day. If the meeting time starts - before the working day, move it on as well. */ + * onto the start of the next working day. If the meeting time starts + * before the working day, move it on as well. */ if (start_time->hour > mts->day_end_hour || (start_time->hour == mts->day_end_hour && start_time->minute > mts->day_end_minute) @@ -2029,12 +2024,14 @@ e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts, } /* This moves the given time backward to the next suitable start of a meeting. - If zoomed_out is set, this means every hour. If not every half-hour. */ + * If zoomed_out is set, this means every hour. If not every half-hour. */ static void e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mts, - EMeetingTime*start_time, - EMeetingTime*end_time, - gint days, gint hours, gint mins) + EMeetingTime *start_time, + EMeetingTime *end_time, + gint days, + gint hours, + gint mins) { gint new_hour, minutes_shown; gboolean set_to_end_of_working_day = FALSE; @@ -2069,7 +2066,7 @@ e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mt e_meeting_time_selector_adjust_time (end_time, days, hours, mins); /* Check if the interval is less than a day as seen in the display. - If it isn't we don't worry about the working day. */ + * If it isn't we don't worry about the working day. */ if (!mts->working_hours_only || days > 0) return; minutes_shown = (mts->day_end_hour - mts->day_start_hour) * 60; @@ -2078,9 +2075,9 @@ e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mt return; /* If the meeting time finishes past the end of the working day, move - back to the end of the working day. If the meeting time starts - before the working day, move it back to the end of the previous - working day. */ + * back to the end of the working day. If the meeting time starts + * before the working day, move it back to the end of the previous + * working day. */ if (start_time->hour > mts->day_end_hour || (start_time->hour == mts->day_end_hour && start_time->minute > mts->day_end_minute) @@ -2113,17 +2110,19 @@ e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mt } /* This adds on the given days, hours & minutes to a EMeetingTimeSelectorTime. - It is used to calculate the end of a period given a start & duration. - Days, hours & minutes can be negative, to move backwards, but they should - be within normal ranges, e.g. hours should be between -23 and 23. */ + * It is used to calculate the end of a period given a start & duration. + * Days, hours & minutes can be negative, to move backwards, but they should + * be within normal ranges, e.g. hours should be between -23 and 23. */ static void -e_meeting_time_selector_adjust_time (EMeetingTime*mtstime, - gint days, gint hours, gint minutes) +e_meeting_time_selector_adjust_time (EMeetingTime *mtstime, + gint days, + gint hours, + gint minutes) { gint new_hours, new_minutes; /* We have to handle negative values for hous and minutes here, since - EMeetingTimeuses guint8s to store them. */ + * EMeetingTimeuses guint8s to store them. */ new_minutes = mtstime->minute + minutes; if (new_minutes < 0) { new_minutes += 60; @@ -2144,12 +2143,12 @@ e_meeting_time_selector_adjust_time (EMeetingTime*mtstime, } /* This looks for any busy period of the given attendee which clashes with - the start and end time. It uses a binary search. */ + * the start and end time. It uses a binary search. */ static EMeetingFreeBusyPeriod * e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts, - EMeetingAttendee *attendee, - EMeetingTime*start_time, - EMeetingTime*end_time) + EMeetingAttendee *attendee, + EMeetingTime *start_time, + EMeetingTime *end_time) { EMeetingFreeBusyPeriod *period; const GArray *busy_periods; @@ -2162,19 +2161,19 @@ e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts, return NULL; /* Step forward through the busy periods until we find a clash or we - go past the end_time. */ + * go past the end_time. */ while (period_num < busy_periods->len) { period = &g_array_index (busy_periods, EMeetingFreeBusyPeriod, period_num); /* If the period starts at or after the end time, there is no - clash and we are finished. The busy periods are sorted by - their start times, so all the rest will be later. */ + * clash and we are finished. The busy periods are sorted by + * their start times, so all the rest will be later. */ if (e_meeting_time_compare_times (&period->start, end_time) >= 0) return NULL; /* If the period ends after the start time, we have found a - clash. From the above test we already know the busy period - isn't completely after the meeting time. */ + * clash. From the above test we already know the busy period + * isn't completely after the meeting time. */ if (e_meeting_time_compare_times (&period->end, start_time) > 0) return period; @@ -2186,12 +2185,12 @@ e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts, static void e_meeting_time_selector_on_zoomed_out_toggled (GtkCheckMenuItem *menuitem, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { gboolean active; /* Make sure the menu pops down, which doesn't happen by default if - keyboard accelerators are used. */ + * keyboard accelerators are used. */ if (gtk_widget_get_visible (mts->options_menu)) gtk_menu_popdown (GTK_MENU (mts->options_menu)); @@ -2202,12 +2201,12 @@ e_meeting_time_selector_on_zoomed_out_toggled (GtkCheckMenuItem *menuitem, static void e_meeting_time_selector_on_working_hours_toggled (GtkCheckMenuItem *menuitem, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { gboolean active; /* Make sure the menu pops down, which doesn't happen by default if - keyboard accelerators are used. */ + * keyboard accelerators are used. */ if (gtk_widget_get_visible (mts->options_menu)) gtk_menu_popdown (GTK_MENU (mts->options_menu)); @@ -2257,7 +2256,7 @@ e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts) /* This saves the first visible time in the given EMeetingTimeSelectorTime. */ static void e_meeting_time_selector_save_position (EMeetingTimeSelector *mts, - EMeetingTime*mtstime) + EMeetingTime *mtstime) { gint scroll_x, scroll_y; @@ -2269,7 +2268,7 @@ e_meeting_time_selector_save_position (EMeetingTimeSelector *mts, /* This restores a saved position. */ static void e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts, - EMeetingTime*mtstime) + EMeetingTime *mtstime) { gint scroll_x, scroll_y, new_scroll_x; @@ -2282,13 +2281,13 @@ e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts, } /* This returns the x pixel coords of the meeting time in the entire scroll - region. It recalculates them if they have been marked as invalid. - If it returns FALSE then no meeting time is set or the meeting time is - not visible in the current scroll area. */ + * region. It recalculates them if they have been marked as invalid. + * If it returns FALSE then no meeting time is set or the meeting time is + * not visible in the current scroll area. */ gboolean e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts, - gint *start_x, - gint *end_x) + gint *start_x, + gint *end_x) { if (mts->meeting_positions_valid) { if (mts->meeting_positions_in_scroll_area) { @@ -2317,12 +2316,12 @@ e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts, } /* This recalculates the date format to used, by computing the width of the - longest date strings in the widget's font and seeing if they fit. */ + * longest date strings in the widget's font and seeing if they fit. */ static void e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts) { /* An array of dates, one for each month in the year 2000. They must - all be Sundays. */ + * all be Sundays. */ static const gint days[12] = { 23, 20, 19, 23, 21, 18, 23, 20, 17, 22, 19, 24 }; GDate date; @@ -2341,7 +2340,7 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts) max_date_width = mts->day_width - 2; /* Find the biggest full weekday name. We start on a particular - Monday and go through seven days. */ + * Monday and go through seven days. */ g_date_clear (&date, 1); g_date_set_dmy (&date, 3, 1, 2000); /* Monday 3rd Jan 2000. */ longest_weekday_width = 0; @@ -2370,13 +2369,13 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts) } /* See if we can use the full date. We want to use a date with a - month day > 20 and also the longest weekday. We use a - pre-calculated array of days for each month and add on the - weekday (which is 1 (Mon) to 7 (Sun). */ + * month day > 20 and also the longest weekday. We use a + * pre-calculated array of days for each month and add on the + * weekday (which is 1 (Mon) to 7 (Sun). */ g_date_set_dmy (&date, days[longest_month - 1] + longest_weekday, longest_month, 2000); /* This is a strftime() format string %A = full weekday name, - %B = full month name, %d = month day, %Y = full year. */ + * %B = full month name, %d = month day, %Y = full year. */ g_date_strftime (buffer, sizeof (buffer), _("%A, %B %d, %Y"), &date); #if 0 @@ -2407,7 +2406,7 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts) g_date_set_dmy (&date, days[longest_month - 1] + longest_weekday, longest_month, 2000); /* This is a strftime() format string %a = abbreviated weekday name, - %m = month number, %d = month day, %Y = full year. */ + * %m = month number, %d = month day, %Y = full year. */ g_date_strftime (buffer, sizeof (buffer), _("%a %m/%d/%Y"), &date); #if 0 @@ -2426,10 +2425,10 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts) } /* Turn off the background of the canvas windows. This reduces flicker - considerably when scrolling. (Why isn't it in GnomeCanvas?). */ + * considerably when scrolling. (Why isn't it in GnomeCanvas?). */ static void e_meeting_time_selector_on_canvas_realized (GtkWidget *widget, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { GdkWindow *window; @@ -2438,12 +2437,12 @@ e_meeting_time_selector_on_canvas_realized (GtkWidget *widget, } /* This is called when the meeting start time GnomeDateEdit is changed, - either via the "date_changed". "time_changed" or "activate" signals on one - of the GtkEntry widgets. So don't use the widget parameter since it may be - one of the child GtkEntry widgets. */ + * either via the "date_changed". "time_changed" or "activate" signals on one + * of the GtkEntry widgets. So don't use the widget parameter since it may be + * one of the child GtkEntry widgets. */ static void e_meeting_time_selector_on_start_time_changed (GtkWidget *widget, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { gint duration_days, duration_hours, duration_minutes; EMeetingTime mtstime; @@ -2484,12 +2483,12 @@ e_meeting_time_selector_on_start_time_changed (GtkWidget *widget, } /* This is called when the meeting end time GnomeDateEdit is changed, - either via the "date_changed", "time_changed" or "activate" signals on one - of the GtkEntry widgets. So don't use the widget parameter since it may be - one of the child GtkEntry widgets. */ + * either via the "date_changed", "time_changed" or "activate" signals on one + * of the GtkEntry widgets. So don't use the widget parameter since it may be + * one of the child GtkEntry widgets. */ static void e_meeting_time_selector_on_end_time_changed (GtkWidget *widget, - EMeetingTimeSelector *mts) + EMeetingTimeSelector *mts) { EMeetingTime mtstime; gint hour = 0, minute = 0; @@ -2517,7 +2516,7 @@ e_meeting_time_selector_on_end_time_changed (GtkWidget *widget, /* If the start time is after the end time, set it to the same time. */ if (e_meeting_time_compare_times (&mtstime, &mts->meeting_start_time) <= 0) { /* We set it first, before updating the widget, so the signal - handler will just return. */ + * handler will just return. */ mts->meeting_start_time = mtstime; if (mts->all_day) g_date_subtract_days (&mts->meeting_start_time.date, 1); @@ -2533,7 +2532,7 @@ e_meeting_time_selector_on_end_time_changed (GtkWidget *widget, } /* This updates the ranges shown in the GnomeDateEdit popup menus, according - to working_hours_only etc. */ + * to working_hours_only etc. */ static void e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts) { @@ -2557,8 +2556,8 @@ e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts) static void e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget, - GtkAllocation *allocation, - EMeetingTimeSelector *mts) + GtkAllocation *allocation, + EMeetingTimeSelector *mts) { e_meeting_time_selector_update_main_canvas_scroll_region (mts); @@ -2566,7 +2565,9 @@ e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget, } static gboolean -e_meeting_time_selector_on_canvas_scroll_event (GtkWidget *widget, GdkEventScroll *event, EMeetingTimeSelector *mts) +e_meeting_time_selector_on_canvas_scroll_event (GtkWidget *widget, + GdkEventScroll *event, + EMeetingTimeSelector *mts) { gboolean return_val = FALSE; @@ -2577,8 +2578,8 @@ e_meeting_time_selector_on_canvas_scroll_event (GtkWidget *widget, GdkEventScrol } /* This updates the canvas scroll regions according to the number of attendees. - If the total height needed is less than the height of the canvas, we must - use the height of the canvas, or it causes problems. */ + * If the total height needed is less than the height of the canvas, we must + * use the height of the canvas, or it causes problems. */ static void e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector *mts) { @@ -2596,13 +2597,13 @@ e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector * } /* This changes the meeting time based on the given x coordinate and whether - we are dragging the start or end bar. It returns the new position, which - will be swapped if the start bar is dragged past the end bar or vice versa. - It make sure the meeting time is never dragged outside the visible canvas - area. */ + * we are dragging the start or end bar. It returns the new position, which + * will be swapped if the start bar is dragged past the end bar or vice versa. + * It make sure the meeting time is never dragged outside the visible canvas + * area. */ void e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts, - gint x) + gint x) { EMeetingTime first_time, last_time, drag_time, *time_to_set; gint scroll_x, scroll_y, canvas_width; @@ -2635,7 +2636,7 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts, } /* Calculate the minimum & maximum times we can use, based on the - scroll offsets and whether zoomed_out is set. */ + * scroll offsets and whether zoomed_out is set. */ e_meeting_time_selector_calculate_time (mts, scroll_x, &first_time); e_meeting_time_selector_calculate_time (mts, scroll_x + canvas_width - 1, &last_time); @@ -2665,7 +2666,7 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts, e_meeting_time_selector_calculate_time (mts, x, &drag_time); /* Calculate the nearest half-hour or hour, depending on whether - zoomed_out is set. */ + * zoomed_out is set. */ if (!mts->all_day) { if (mts->zoomed_out) { if (drag_time.minute > 30) @@ -2749,8 +2750,8 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts, } /* This is the timeout function which handles auto-scrolling when the user is - dragging one of the meeting time vertical bars outside the left or right - edge of the canvas. */ + * dragging one of the meeting time vertical bars outside the left or right + * edge of the canvas. */ static gboolean e_meeting_time_selector_timeout_handler (gpointer data) { @@ -2797,7 +2798,7 @@ e_meeting_time_selector_timeout_handler (gpointer data) scroll_x = CLAMP (scroll_x, 0, max_scroll_x); /* Calculate the minimum or maximum visible time in the canvas, which - we will now set the dragged time to. */ + * we will now set the dragged time to. */ if (scroll_offset > 0) { e_meeting_time_selector_calculate_time (mts, scroll_x + canvas_width - 1, @@ -2890,9 +2891,9 @@ e_meeting_time_selector_timeout_handler (gpointer data) 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. */ + * 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. */ gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_main), scroll_x, scroll_y); gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_top), @@ -2943,7 +2944,7 @@ e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts) } /* This ensures that the meeting time is shown on screen, by scrolling the - canvas and possibly by changing the range of dates shown in the canvas. */ + * canvas and possibly by changing the range of dates shown in the canvas. */ static void e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts) { @@ -2983,7 +2984,7 @@ e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts) } /* This updates the range of dates shown in the canvas, to make sure that the - currently selected meeting time is in the range. */ + * currently selected meeting time is in the range. */ static void e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts) { @@ -2997,10 +2998,10 @@ e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts) } /* This checks if the time's hour is over 24 or its minute is over 60 and if - so it updates the day/hour appropriately. Note that hours and minutes are - stored in guint8's so they can't overflow by much. */ + * so it updates the day/hour appropriately. Note that hours and minutes are + * stored in guint8's so they can't overflow by much. */ void -e_meeting_time_selector_fix_time_overflows (EMeetingTime*mtstime) +e_meeting_time_selector_fix_time_overflows (EMeetingTime *mtstime) { gint hours_to_add, days_to_add; @@ -3023,16 +3024,16 @@ e_meeting_time_selector_fix_time_overflows (EMeetingTime*mtstime) */ /* This takes an x pixel coordinate within the entire canvas scroll region and - returns the date in which it falls. If day_position is not NULL it also - returns the x coordinate within the date, relative to the visible part of - the canvas. It is used when painting the days in the item_draw function. - Note that it must handle negative x coordinates in case we are dragging off - the edge of the canvas. */ + * returns the date in which it falls. If day_position is not NULL it also + * returns the x coordinate within the date, relative to the visible part of + * the canvas. It is used when painting the days in the item_draw function. + * Note that it must handle negative x coordinates in case we are dragging off + * the edge of the canvas. */ void e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts, - gint x, - GDate *date, - gint *day_position) + gint x, + GDate *date, + gint *day_position) { gint days_from_first_shown; @@ -3052,9 +3053,12 @@ e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts, } /* This takes an x pixel coordinate within a day, and converts it to hours - and minutes, depending on working_hours_only and zoomed_out. */ + * and minutes, depending on working_hours_only and zoomed_out. */ void -e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSelector *mts, gint day_position, guint8 *hours, guint8 *minutes) +e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSelector *mts, + gint day_position, + guint8 *hours, + guint8 *minutes) { if (mts->zoomed_out) day_position *= 3; @@ -3068,14 +3072,14 @@ e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSele } /* This takes an x pixel coordinate within the entire canvas scroll region and - returns the time in which it falls. Note that it won't be extremely - accurate since hours may only be a few pixels wide in the display. - With zoomed_out set each pixel may represent 5 minutes or more, depending - on how small the font is. */ + * returns the time in which it falls. Note that it won't be extremely + * accurate since hours may only be a few pixels wide in the display. + * With zoomed_out set each pixel may represent 5 minutes or more, depending + * on how small the font is. */ void e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts, - gint x, - EMeetingTime*time) + gint x, + EMeetingTime *time) { gint day_position; @@ -3093,23 +3097,23 @@ e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts, } /* This takes a EMeetingTime and calculates the x pixel coordinate - within the entire canvas scroll region. It is used to draw the selected - meeting time and all the busy periods. */ + * within the entire canvas scroll region. It is used to draw the selected + * meeting time and all the busy periods. */ gint e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts, - EMeetingTime *mtstime) + EMeetingTime *mtstime) { gint x, date_offset, day_offset; /* Calculate the number of days since the first date shown in the - entire canvas scroll region. */ + * entire canvas scroll region. */ 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; /* Add on the hours and minutes, depending on whether zoomed_out and - working_hours_only are set. */ + * working_hours_only are set. */ day_offset = (mtstime->hour - mts->first_hour_shown) * 60 + mtstime->minute; /* The day width includes an extra vertical grid line so subtract 1. */ @@ -3123,7 +3127,10 @@ e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts, } static void -row_inserted_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) +row_inserted_cb (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) { EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data); gint row = gtk_tree_path_get_indices (path)[0]; @@ -3139,7 +3146,10 @@ row_inserted_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpoi } static void -row_changed_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) +row_changed_cb (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) { EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data); gint row = gtk_tree_path_get_indices (path)[0]; @@ -3149,7 +3159,9 @@ row_changed_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpoin } static void -row_deleted_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data) +row_deleted_cb (GtkTreeModel *model, + GtkTreePath *path, + gpointer data) { EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data); -- cgit From 53bc6ffc531d7a7188e15be245a31f301090ee15 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 10 Sep 2011 11:47:15 -0400 Subject: The EExtension framework is now in libebackend. The EModule, EExtensible and EExtension classes as well as the e_type_traverse() function have been moved to Evolution-Data-Server's libebackend library to replace e-data-server-module.c. Now Evolution-Data-Server modules use the same framework as Evolution. --- calendar/gui/e-meeting-time-sel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 9afdfd7a22..36e7ad7d42 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -31,15 +31,15 @@ #include #include #include -#include #include +#include +#include #include #include "misc/e-canvas.h" #include "misc/e-canvas-utils.h" - #include "misc/e-dateedit.h" -#include "e-util/e-extensible.h" + #include "e-util/e-util.h" #include "e-meeting-utils.h" -- cgit