aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-10-13 18:55:34 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-10-13 18:55:34 +0800
commitcb3e037f8f55f95892104326807d9988be87fbe4 (patch)
treeacac7b63e7a8b1ea4f37273363cb423dbff491ed /calendar/gui
parentb77871e4fd7a4464e3a2e4e458f0d10e71805a02 (diff)
parentee5ca188d56abc91ca9fce034322466d5b0f4b9f (diff)
downloadgsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar.gz
gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar.zst
gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.zip
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/e-calendar-view.c16
-rw-r--r--calendar/gui/e-calendar-view.h3
2 files changed, 11 insertions, 8 deletions
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 109ce4539d..2a762e411d 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1826,8 +1826,7 @@ e_calendar_view_move_tip (GtkWidget *widget,
*/
gboolean
-e_calendar_view_get_tooltips (ECalendarView *cal_view,
- const ECalendarViewEventData *data)
+e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
{
GtkWidget *label, *box, *hbox, *ebox, *frame;
const gchar *str;
@@ -1838,7 +1837,7 @@ e_calendar_view_get_tooltips (ECalendarView *cal_view,
time_t t_start, t_end;
ECalendarViewEvent *pevent;
GtkStyle *style = gtk_widget_get_default_style ();
- GtkWidget *widget = (GtkWidget *) g_object_get_data (G_OBJECT (data->cal_view), "tooltip-window");
+ GtkWidget *widget;
GdkWindow *window;
ECalComponent *newcomp = e_cal_component_new ();
icaltimezone *zone, *default_zone;
@@ -1846,12 +1845,17 @@ e_calendar_view_get_tooltips (ECalendarView *cal_view,
ECalClient *client = NULL;
gboolean free_text = FALSE;
- g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), FALSE);
+ /* This function is a timeout callback. */
- model = e_calendar_view_get_model (cal_view);
+ g_return_val_if_fail (data != NULL, FALSE);
+ g_return_val_if_fail (E_IS_CALENDAR_VIEW (data->cal_view), FALSE);
+
+ model = e_calendar_view_get_model (data->cal_view);
/* Delete any stray tooltip if left */
- if (widget)
+ widget = g_object_get_data (
+ G_OBJECT (data->cal_view), "tooltip-window");
+ if (GTK_IS_WIDGET (widget))
gtk_widget_destroy (widget);
default_zone = e_calendar_view_get_timezone (data->cal_view);
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index 7ebcef7d1c..8d54275d1d 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -248,8 +248,7 @@ void e_calendar_view_modify_and_send (ECalendarView *cal_view,
GtkWindow *toplevel,
gboolean new);
-gboolean e_calendar_view_get_tooltips (ECalendarView *cal_view,
- const ECalendarViewEventData *data);
+gboolean e_calendar_view_get_tooltips (const ECalendarViewEventData *data);
void e_calendar_view_move_tip (GtkWidget *widget,
gint x,