Re: [evolution-patches] Patch for a lot of compiler warnings and some other cleanups in evolution/calendar/*



fre, 29,.09.2006 kl. 06.37 +0000, skrev chenthill:
> Hi kmaraas,
>           The patch looks great !!!
> 
> Some comments,
> 
> Index: gui/e-day-view-config.c
> +	gint not, not_1, not_2;
> not should be guint,
> the other two variables should be gint and please add another variable
> to get the values for the marcus banes line notifications.
> 
You mean like this?

--- e-day-view-config.c 8 Feb 2006 13:06:02 -0000       1.11
+++ e-day-view-config.c 29 Sep 2006 09:03:00 -0000
@@ -394,7 +394,8 @@ void
 e_day_view_config_set_view (EDayViewConfig *view_config, EDayView *day_view) 
 {
        EDayViewConfigPrivate *priv;
-       guint not, not_1, not_2;
+       gint not_1, not_2, mbnot;
+       guint not;
        GList *l;
 
        g_return_if_fail (view_config != NULL);
@@ -476,8 +477,8 @@ e_day_view_config_set_view (EDayViewConf
        /* Showing Marcus Bains Line */
        set_marcus_bains (day_view);
 
-       calendar_config_add_notification_marcus_bains (marcus_bains_changed_cb, view_config, &not, &not_1, &not_2);
-       priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
+       calendar_config_add_notification_marcus_bains (marcus_bains_changed_cb, view_config, &mbnot, &not_1, &not_2);
+       priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (mbnot));
        priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not_1));
        priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not_2));

> Index: gui/e-meeting-list-view.c
> -			dl = e_destination_list_get_dests (des);
> +			dl = g_list_copy ((GList *)e_destination_list_get_dests (des));
> The list should not be copied, as it removes the attendee from the
> destination itself, else the removed attendees would be re-added to
> meeting editor. 
> 
I'm trying to get rid of warnings caused by
e_destination_list_get_dests() returning a const GList, but the code
doesn't handle it like a const.

> Index: gui/gnome-cal.c
> -		e_calendar_table_copy_clipboard (E_MEMO_TABLE (priv->memo));
> e_calendar_table should be changed to e_memo_table.
> 
Like this?

Index: gnome-cal.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/gnome-cal.c,v
retrieving revision 1.401
diff -u -p -r1.401 gnome-cal.c
--- gnome-cal.c 28 Aug 2006 05:24:15 -0000      1.401
+++ gnome-cal.c 29 Sep 2006 09:11:10 -0000
@@ -1427,7 +1427,7 @@ view_done_cb (ECalModel *model, ECalenda
 GtkWidget * 
 gnome_calendar_get_tag (GnomeCalendar *gcal)
 {
-       return gcal->priv->date_navigator;
+       return GTK_WIDGET (gcal->priv->date_navigator);
 }
 
 static void
@@ -3444,7 +3444,7 @@ gnome_calendar_cut_clipboard (GnomeCalen
        } else if (location == FOCUS_TASKPAD)
                e_calendar_table_cut_clipboard (E_CALENDAR_TABLE (priv->todo));
        else if (location == FOCUS_MEMOPAD)
-               e_calendar_table_copy_clipboard (E_MEMO_TABLE (priv->memo));
+               e_memo_table_cut_clipboard (E_MEMO_TABLE (priv->memo));
 }
 
 void
@@ -3462,7 +3462,7 @@ gnome_calendar_copy_clipboard (GnomeCale
        } else if (location == FOCUS_TASKPAD)
                e_calendar_table_copy_clipboard (E_CALENDAR_TABLE (priv->todo));
        else if (location == FOCUS_MEMOPAD)
-               e_calendar_table_copy_clipboard (E_MEMO_TABLE (priv->memo));
+               e_memo_table_copy_clipboard (E_MEMO_TABLE (priv->memo));
 }
 

> 
> The rest of the patch looks good to commit. The other parts except the
> above mentioned parts can be committed immediately. The patch for the
> commented part can be sent for review separately.

Cheers
Kjartan





[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]