[evolution-patches] cleanups for evolution/widgets
- From: Kjartan Maraas <kmaraas broadpark no>
- To: evolution-patches <evolution-patches gnome org>
- Subject: [evolution-patches] cleanups for evolution/widgets
- Date: Sat, 10 Dec 2005 23:10:17 +0100
And the final one.
Cheers
Kjartan
Index: e-timezone-dialog/e-timezone-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/e-timezone-dialog/e-timezone-dialog.c,v
retrieving revision 1.17
diff -u -p -r1.17 e-timezone-dialog.c
--- e-timezone-dialog/e-timezone-dialog.c 23 Jun 2005 09:11:09 -0000 1.17
+++ e-timezone-dialog/e-timezone-dialog.c 10 Dec 2005 22:09:34 -0000
@@ -490,12 +490,9 @@ static icaltimezone *
get_zone_from_point (ETimezoneDialog *etd,
EMapPoint *point)
{
- ETimezoneDialogPrivate *priv;
icalarray *zones;
double longitude, latitude;
int i;
-
- priv = etd->priv;
if (point == NULL)
return NULL;
Index: menus/gal-view-menus.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/menus/gal-view-menus.c,v
retrieving revision 1.46
diff -u -p -r1.46 gal-view-menus.c
--- menus/gal-view-menus.c 17 Jun 2005 15:20:32 -0000 1.46
+++ menus/gal-view-menus.c 10 Dec 2005 22:09:34 -0000
@@ -53,7 +53,7 @@ static void instance_changed (GalViewIns
#define d(x)
#define CURRENT_VIEW_PATH "/menu/View/ViewBegin/CurrentView"
-G_DEFINE_TYPE(GalViewMenus, gal_view_menus, G_TYPE_OBJECT);
+G_DEFINE_TYPE(GalViewMenus, gal_view_menus, G_TYPE_OBJECT)
static void
closure_free (void *data, void *user_data)
Index: misc/e-attachment-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-attachment-bar.c,v
retrieving revision 1.13
diff -u -p -r1.13 e-attachment-bar.c
--- misc/e-attachment-bar.c 17 Nov 2005 04:41:41 -0000 1.13
+++ misc/e-attachment-bar.c 10 Dec 2005 22:09:35 -0000
@@ -214,9 +214,6 @@ calculate_height_width(EAttachmentBar *b
int width, height, icon_width;
PangoFontMetrics *metrics;
PangoContext *context;
- GnomeIconList *icon_list;
-
- icon_list = GNOME_ICON_LIST (bar);
context = gtk_widget_get_pango_context ((GtkWidget *) bar);
metrics = pango_context_get_metrics (context, ((GtkWidget *) bar)->style->font_desc, pango_context_get_language (context));
@@ -425,11 +422,9 @@ update (EAttachmentBar *bar)
static void
update_remote_file (EAttachment *attachment, EAttachmentBar *bar)
{
- EAttachmentBarPrivate *priv;
GnomeIconList *icon_list;
GnomeIconTextItem *item;
char *msg, *base;
- priv = bar->priv;
if (attachment->percentage == -1) {
update (bar);
@@ -572,7 +567,6 @@ e_attachment_bar_get_attachment (EAttach
{
GSList *attachments = NULL;
GList *p;
- EAttachment *attachment;
g_return_val_if_fail (bar != NULL, 0);
g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), 0);
@@ -582,7 +576,7 @@ e_attachment_bar_get_attachment (EAttach
FIXME in the future. */
if (id == -1
- || (attachment = g_list_nth_data(bar->priv->attachments, id)) == NULL) {
+ || (g_list_nth_data(bar->priv->attachments, id)) == NULL) {
p = gnome_icon_list_get_selection((GnomeIconList *)bar);
for ( ; p != NULL; p = p->next) {
int num = GPOINTER_TO_INT(p->data);
@@ -902,12 +896,8 @@ static void
class_init (EAttachmentBarClass *klass)
{
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GnomeIconListClass *icon_list_class;
object_class = GTK_OBJECT_CLASS (klass);
- widget_class = GTK_WIDGET_CLASS (klass);
- icon_list_class = GNOME_ICON_LIST_CLASS (klass);
parent_class = g_type_class_ref (gnome_icon_list_get_type ());
Index: misc/e-attachment.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-attachment.c,v
retrieving revision 1.7
diff -u -p -r1.7 e-attachment.c
--- misc/e-attachment.c 24 Aug 2005 04:22:14 -0000 1.7
+++ misc/e-attachment.c 10 Dec 2005 22:09:36 -0000
@@ -329,14 +329,12 @@ async_progress_update_cb (GnomeVFSAsyncH
g_free (download_info);
}
return TRUE;
- break;
}
case GNOME_VFS_XFER_PROGRESS_STATUS_VFSERROR:
gnome_vfs_async_cancel (handle);
g_free (download_info->file_name);
g_free (download_info);
return FALSE;
- break;
default:
break;
@@ -357,6 +355,7 @@ download_to_local_path (GnomeVFSURI *so
target_uri_list = g_list_prepend (target_uri_list, target_uri);
/* Callback info */
+ /* Maybe check the result here somewhere? */
result = gnome_vfs_async_xfer (&download_info->attachment->handle, /* handle_return */
source_uri_list, /* source_uri_list */
target_uri_list, /* target_uri_list */
Index: misc/e-calendar-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-calendar-item.c,v
retrieving revision 1.46
diff -u -p -r1.46 e-calendar-item.c
--- misc/e-calendar-item.c 24 Aug 2005 03:09:00 -0000 1.46
+++ misc/e-calendar-item.c 10 Dec 2005 22:09:37 -0000
@@ -458,10 +458,8 @@ e_calendar_item_destroy (GtkObject *o)
static void
e_calendar_item_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
{
- GnomeCanvasItem *item;
ECalendarItem *calitem;
- item = GNOME_CANVAS_ITEM (o);
calitem = E_CALENDAR_ITEM (o);
switch (arg_id) {
@@ -680,15 +678,12 @@ static void
e_calendar_item_realize (GnomeCanvasItem *item)
{
ECalendarItem *calitem;
- GdkColormap *colormap;
if (GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->realize)
(* GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->realize) (item);
calitem = E_CALENDAR_ITEM (item);
- colormap = gtk_widget_get_colormap (GTK_WIDGET (item->canvas));
-
e_calendar_item_style_set (GTK_WIDGET(item->canvas), calitem);
}
@@ -2990,12 +2985,11 @@ e_calendar_item_ensure_days_visible (ECa
gboolean emission)
{
gint current_end_year, current_end_month;
- gint months_shown, months;
+ gint months_shown;
gint first_day_offset, days_in_month, days_in_prev_month;
gboolean need_update = FALSE;
months_shown = calitem->rows * calitem->cols;
- months = (end_year - start_year) * 12 + end_month - start_month;
/* Calculate the range of months currently displayed. */
current_end_year = calitem->year;
Index: misc/e-calendar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-calendar.c,v
retrieving revision 1.26
diff -u -p -r1.26 e-calendar.c
--- misc/e-calendar.c 28 Apr 2005 08:03:47 -0000 1.26
+++ misc/e-calendar.c 10 Dec 2005 22:09:37 -0000
@@ -538,12 +538,6 @@ e_calendar_drag_motion (GtkWidget *
gint y,
guint time)
{
- ECalendar *cal;
-
- g_return_val_if_fail (E_IS_CALENDAR (widget), FALSE);
-
- cal = E_CALENDAR (widget);
-
#if 0
g_print ("In e_calendar_drag_motion\n");
#endif
@@ -557,12 +551,6 @@ e_calendar_drag_leave (GtkWidget *w
GdkDragContext *context,
guint time)
{
- ECalendar *cal;
-
- g_return_if_fail (E_IS_CALENDAR (widget));
-
- cal = E_CALENDAR (widget);
-
#if 0
g_print ("In e_calendar_drag_leave\n");
#endif
@@ -631,7 +619,6 @@ e_calendar_focus (GtkWidget *widget, Gtk
return FALSE;
gnome_canvas_item_grab_focus (children[focused_index]);
if (GNOME_IS_CANVAS_WIDGET (children[focused_index])) {
- GtkWidget *widget;
widget = GNOME_CANVAS_WIDGET (children[focused_index])->widget;
gtk_widget_grab_focus (widget);
}
Index: misc/e-canvas-background.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-canvas-background.c,v
retrieving revision 1.13
diff -u -p -r1.13 e-canvas-background.c
--- misc/e-canvas-background.c 21 Aug 2005 18:10:23 -0000 1.13
+++ misc/e-canvas-background.c 10 Dec 2005 22:09:37 -0000
@@ -283,10 +283,8 @@ ecb_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- GnomeCanvasItem *item;
ECanvasBackground *ecb;
- item = GNOME_CANVAS_ITEM (object);
ecb = E_CANVAS_BACKGROUND (object);
switch (prop_id){
Index: misc/e-canvas.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-canvas.c,v
retrieving revision 1.48
diff -u -p -r1.48 e-canvas.c
--- misc/e-canvas.c 17 Jun 2005 15:20:33 -0000 1.48
+++ misc/e-canvas.c 10 Dec 2005 22:09:37 -0000
@@ -76,11 +76,9 @@ static void
e_canvas_class_init (ECanvasClass *klass)
{
GObjectClass *object_class;
- GnomeCanvasClass *canvas_class;
GtkWidgetClass *widget_class;
object_class = (GObjectClass*) klass;
- canvas_class = (GnomeCanvasClass *) klass;
widget_class = (GtkWidgetClass *) klass;
parent_class = g_type_class_ref (PARENT_TYPE);
@@ -434,9 +432,6 @@ pick_current_item (GnomeCanvas *canvas,
&& (canvas->current_item != NULL)
&& !canvas->left_grabbed_item) {
GdkEvent new_event;
- GnomeCanvasItem *item;
-
- item = canvas->current_item;
new_event = canvas->pick_event;
new_event.type = GDK_LEAVE_NOTIFY;
Index: misc/e-cell-date-edit.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-cell-date-edit.c,v
retrieving revision 1.24
diff -u -p -r1.24 e-cell-date-edit.c
--- misc/e-cell-date-edit.c 24 Nov 2005 14:23:23 -0000 1.24
+++ misc/e-cell-date-edit.c 10 Dec 2005 22:09:37 -0000
@@ -113,7 +113,7 @@ enum {
ARG_UPPER_HOUR
};
-G_DEFINE_TYPE (ECellDateEdit, e_cell_date_edit, E_CELL_POPUP_TYPE);
+G_DEFINE_TYPE (ECellDateEdit, e_cell_date_edit, E_CELL_POPUP_TYPE)
static void
@@ -431,17 +431,10 @@ e_cell_date_edit_do_popup (ECellPopup *
int view_col)
{
ECellDateEdit *ecde = E_CELL_DATE_EDIT (ecp);
- guint32 time;
e_cell_date_edit_show_popup (ecde, row, view_col);
e_cell_date_edit_set_popup_values (ecde);
- if (event->type == GDK_BUTTON_PRESS) {
- time = event->button.time;
- } else {
- time = event->key.time;
- }
-
gtk_grab_add (ecde->popup_window);
/* Set the focus to the first widget. */
@@ -548,14 +541,12 @@ e_cell_date_edit_show_popup (ECellDateE
int row,
int view_col)
{
- gint x, y, width, height, old_width, old_height;
+ gint x, y, width, height;
if (ecde->need_time_list_rebuild)
e_cell_date_edit_rebuild_time_list (ecde);
/* This code is practically copied from GtkCombo. */
- old_width = ecde->popup_window->allocation.width;
- old_height = ecde->popup_window->allocation.height;
e_cell_date_edit_get_popup_pos (ecde, row, view_col, &x, &y, &height, &width);
Index: misc/e-cell-percent.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-cell-percent.c,v
retrieving revision 1.7
diff -u -p -r1.7 e-cell-percent.c
--- misc/e-cell-percent.c 26 Nov 2004 15:15:36 -0000 1.7
+++ misc/e-cell-percent.c 10 Dec 2005 22:09:37 -0000
@@ -40,7 +40,7 @@
#include "e-cell-percent.h"
-G_DEFINE_TYPE (ECellPercent, e_cell_percent, E_CELL_TEXT_TYPE);
+G_DEFINE_TYPE (ECellPercent, e_cell_percent, E_CELL_TEXT_TYPE)
static char *
Index: misc/e-charset-picker.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-charset-picker.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-charset-picker.c
--- misc/e-charset-picker.c 28 Sep 2005 11:35:31 -0000 1.21
+++ misc/e-charset-picker.c 10 Dec 2005 22:09:37 -0000
@@ -485,7 +485,7 @@ e_charset_picker_bonobo_ui_populate (Bon
g_free (label);
for (i = 0; i < num_charsets; i++) {
- char *command, *label, *encoded_label;
+ char *command;
char *charset_name, *u;
/* escape _'s in the charset name so that it doesn't become an underline in a GtkLabel */
@@ -542,7 +542,7 @@ e_charset_picker_bonobo_ui_populate (Bon
}
if (def == num_charsets) {
- char *command, *label, *encoded_label;
+ char *command;
char *charset_name, *u;
/* escape _'s in the charset name so that it doesn't become an underline in a GtkLabel */
Index: misc/e-config-page.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-config-page.c,v
retrieving revision 1.6
diff -u -p -r1.6 e-config-page.c
--- misc/e-config-page.c 26 Nov 2004 15:15:36 -0000 1.6
+++ misc/e-config-page.c 10 Dec 2005 22:09:37 -0000
@@ -34,9 +34,6 @@ G_DEFINE_TYPE (EConfigPage, e_config_pag
static void
e_config_page_class_init (EConfigPageClass *class)
{
- GObjectClass *object_class;
-
- object_class = G_OBJECT_CLASS (class);
}
static void
Index: misc/e-dateedit.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-dateedit.c,v
retrieving revision 1.49
diff -u -p -r1.49 e-dateedit.c
--- misc/e-dateedit.c 24 Nov 2005 14:23:23 -0000 1.49
+++ misc/e-dateedit.c 10 Dec 2005 22:09:38 -0000
@@ -714,13 +714,10 @@ e_date_edit_set_date (EDateEdit *dedit,
gint month,
gint day)
{
- EDateEditPrivate *priv;
gboolean date_changed = FALSE;
g_return_if_fail (E_IS_DATE_EDIT (dedit));
- priv = dedit->priv;
-
date_changed = e_date_edit_set_date_internal (dedit, TRUE, FALSE,
year - 1900, month - 1,
day);
@@ -821,13 +818,10 @@ e_date_edit_set_date_and_time_of_day
gint hour,
gint minute)
{
- EDateEditPrivate *priv;
gboolean date_changed, time_changed;
g_return_if_fail (E_IS_DATE_EDIT (dedit));
- priv = dedit->priv;
-
date_changed = e_date_edit_set_date_internal (dedit, TRUE, FALSE,
year - 1900, month - 1, day);
time_changed = e_date_edit_set_time_internal (dedit, TRUE, FALSE,
@@ -1266,10 +1260,7 @@ static void
on_date_popup_date_selected (ECalendarItem *calitem,
EDateEdit *dedit)
{
- EDateEditPrivate *priv;
GDate start_date, end_date;
-
- priv = dedit->priv;
hide_date_popup (dedit);
Index: misc/e-dropdown-button.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-dropdown-button.c,v
retrieving revision 1.16
diff -u -p -r1.16 e-dropdown-button.c
--- misc/e-dropdown-button.c 26 Nov 2004 15:15:36 -0000 1.16
+++ misc/e-dropdown-button.c 10 Dec 2005 22:09:38 -0000
@@ -137,11 +137,9 @@ static void
e_dropdown_button_class_init (EDropdownButtonClass *klass)
{
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
GtkToggleButtonClass *toggle_class;
object_class = GTK_OBJECT_CLASS (klass);
- widget_class = GTK_WIDGET_CLASS (klass);
toggle_class = GTK_TOGGLE_BUTTON_CLASS (klass);
object_class->destroy = impl_destroy;
Index: misc/e-expander.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-expander.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-expander.c
--- misc/e-expander.c 1 Jun 2004 16:11:36 -0000 1.3
+++ misc/e-expander.c 10 Dec 2005 22:09:38 -0000
@@ -592,7 +592,6 @@ static GdkRectangle
get_expander_bounds (EExpander *expander)
{
GtkWidget *widget;
- GtkBin *bin;
EExpanderPrivate *priv;
GdkRectangle bounds;
gint border_width;
@@ -604,7 +603,6 @@ get_expander_bounds (EExpander *expander
gboolean ltr;
widget = GTK_WIDGET (expander);
- bin = GTK_BIN (expander);
priv = E_EXPANDER_GET_PRIVATE (expander);
@@ -755,9 +753,6 @@ e_expander_expose (GtkWidget *widge
if (GTK_WIDGET_DRAWABLE (widget))
{
EExpander *expander = E_EXPANDER (widget);
- EExpanderPrivate *priv;
-
- priv = E_EXPANDER_GET_PRIVATE (expander);
e_expander_paint (expander);
@@ -777,14 +772,9 @@ is_in_expander_panel (EExpander *expande
gint y)
{
GtkWidget *widget;
- GtkBin *bin;
GdkRectangle area;
- gint border_width;
widget = GTK_WIDGET (expander);
- bin = GTK_BIN (expander);
-
- border_width = GTK_CONTAINER (expander)->border_width;
area = get_expander_bounds (expander);
Index: misc/e-filter-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-filter-bar.c,v
retrieving revision 1.52
diff -u -p -r1.52 e-filter-bar.c
--- misc/e-filter-bar.c 15 Aug 2005 03:15:06 -0000 1.52
+++ misc/e-filter-bar.c 10 Dec 2005 22:09:38 -0000
@@ -400,11 +400,11 @@ build_items (ESearchBar *esb, ESearchBar
/* always add on the advanced menu */
if (type == 1) {
- ESearchBarItem items[2] = { E_FILTERBAR_SEPARATOR, E_FILTERBAR_ADVANCED };
+ ESearchBarItem sb_items[2] = { E_FILTERBAR_SEPARATOR, E_FILTERBAR_ADVANCED };
ESearchBarItem dup_items[2];
- dup_item_no_subitems (&dup_items[0], &items[0]);
- dup_item_no_subitems (&dup_items[1], &items[1]);
+ dup_item_no_subitems (&dup_items[0], &sb_items[0]);
+ dup_item_no_subitems (&dup_items[1], &sb_items[1]);
g_array_append_vals (menu, &dup_items, 2);
}
Index: misc/e-image-chooser.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-image-chooser.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-image-chooser.c
--- misc/e-image-chooser.c 29 Jul 2005 04:05:17 -0000 1.4
+++ misc/e-image-chooser.c 10 Dec 2005 22:09:39 -0000
@@ -147,7 +147,7 @@ e_image_chooser_class_init (EImageChoose
object_class->dispose = e_image_chooser_dispose;
}
-#if UI_CHANGE_OK
+#ifdef UI_CHANGE_OK
static void
browse_for_image_cb (GtkWidget *button, gpointer data)
{
@@ -168,7 +168,7 @@ e_image_chooser_init (EImageChooser *cho
gtk_container_add (GTK_CONTAINER (alignment), priv->image);
-#if UI_CHANGE_OK
+#ifdef UI_CHANGE_OK
priv->browse_button = gtk_button_new_with_label (_("Choose Image"));
#endif
@@ -177,7 +177,7 @@ e_image_chooser_init (EImageChooser *cho
gtk_container_add (GTK_CONTAINER (priv->frame), alignment);
gtk_box_set_homogeneous (GTK_BOX (chooser), FALSE);
gtk_box_pack_start (GTK_BOX (chooser), priv->frame, TRUE, TRUE, 0);
-#if UI_CHANGE_OK
+#ifdef UI_CHANGE_OK
gtk_box_pack_start (GTK_BOX (chooser), priv->browse_button, FALSE, FALSE, 0);
g_signal_connect (priv->browse_button, "clicked", G_CALLBACK (browse_for_image_cb), NULL);
@@ -194,7 +194,7 @@ e_image_chooser_init (EImageChooser *cho
"drag_data_received", G_CALLBACK (image_drag_data_received_cb), chooser);
gtk_widget_show_all (priv->frame);
-#if UI_CHANGE_OK
+#ifdef UI_CHANGE_OK
gtk_widget_show (priv->browse_button);
#endif
@@ -414,6 +414,7 @@ image_drag_data_received_cb (GtkWidget *
char *uri;
char *nl = strstr (selection_data->data, "\r\n");
char *buf = NULL;
+ /* Why can't we change the info parameter to a GnomeVFSFileInfo and use that? */
GnomeVFSFileInfo info;
if (nl)
Index: misc/e-map.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-map.c,v
retrieving revision 1.7
diff -u -p -r1.7 e-map.c
--- misc/e-map.c 1 Nov 2004 05:04:37 -0000 1.7
+++ misc/e-map.c 10 Dec 2005 22:09:39 -0000
@@ -371,8 +371,6 @@ static void
e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
{
EMap *view;
- EMapPrivate *priv;
- int xofs, yofs;
GdkRectangle area;
g_return_if_fail (widget != NULL);
@@ -380,10 +378,6 @@ e_map_size_allocate (GtkWidget *widget,
g_return_if_fail (allocation != NULL);
view = E_MAP (widget);
- priv = view->priv;
-
- xofs = priv->xofs;
- yofs = priv->yofs;
/* Resize the window */
@@ -409,12 +403,6 @@ e_map_size_allocate (GtkWidget *widget,
static gint
e_map_button_press (GtkWidget *widget, GdkEventButton *event)
{
- EMap *view;
- EMapPrivate *priv;
-
- view = E_MAP (widget);
- priv = view->priv;
-
if (!GTK_WIDGET_HAS_FOCUS (widget)) gtk_widget_grab_focus (widget);
return TRUE;
}
@@ -425,12 +413,6 @@ e_map_button_press (GtkWidget *widget, G
static gint
e_map_button_release (GtkWidget *widget, GdkEventButton *event)
{
- EMap *view;
- EMapPrivate *priv;
-
- view = E_MAP (widget);
- priv = view->priv;
-
if (event->button != 1) return FALSE;
gdk_pointer_ungrab (event->time);
@@ -443,12 +425,6 @@ e_map_button_release (GtkWidget *widget,
static gint
e_map_motion (GtkWidget *widget, GdkEventMotion *event)
{
- EMap *view;
- EMapPrivate *priv;
-
- view = E_MAP (widget);
- priv = view->priv;
-
return FALSE;
/*
@@ -724,7 +700,6 @@ void
e_map_zoom_to_location (EMap *map, double longitude, double latitude)
{
EMapPrivate *priv;
- int width, height;
g_return_if_fail (map);
g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map)));
@@ -734,9 +709,6 @@ e_map_zoom_to_location (EMap *map, doubl
if (priv->zoom_state == E_MAP_ZOOMED_IN) e_map_zoom_out (map);
else if (priv->zoom_state != E_MAP_ZOOMED_OUT) return;
- width = gdk_pixbuf_get_width (priv->map_render_pixbuf);
- height = gdk_pixbuf_get_height (priv->map_render_pixbuf);
-
priv->zoom_state = E_MAP_ZOOMING_IN;
priv->zoom_target_long = longitude;
priv->zoom_target_lat = latitude;
@@ -749,7 +721,6 @@ void
e_map_zoom_out (EMap *map)
{
EMapPrivate *priv;
- int width, height;
g_return_if_fail (map);
g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map)));
@@ -758,9 +729,6 @@ e_map_zoom_out (EMap *map)
if (priv->zoom_state != E_MAP_ZOOMED_IN) return;
- width = gdk_pixbuf_get_width (priv->map_render_pixbuf);
- height = gdk_pixbuf_get_height (priv->map_render_pixbuf);
-
priv->zoom_state = E_MAP_ZOOMING_OUT;
zoom_do (map);
priv->zoom_state = E_MAP_ZOOMED_OUT;
@@ -1142,16 +1110,12 @@ update_render_point (EMap *map, EMapPoin
{
EMapPrivate *priv;
GdkPixbuf *pb;
- int width, height;
double px, py;
priv = map->priv;
pb = priv->map_render_pixbuf;
if (!pb) return;
- width = gdk_pixbuf_get_width (pb);
- height = gdk_pixbuf_get_height (pb);
-
e_map_world_to_window (map, point->longitude, point->latitude, &px, &py);
px += priv->xofs;
py += priv->yofs;
@@ -1178,12 +1142,10 @@ update_render_point (EMap *map, EMapPoin
static void
repaint_point (EMap *map, EMapPoint *point)
{
- EMapPrivate *priv;
GdkRectangle area;
double px, py;
if (!e_map_point_is_in_view (map, point)) return;
- priv = map->priv;
e_map_world_to_window (map, point->longitude, point->latitude, &px, &py);
@@ -1583,8 +1545,6 @@ zoom_in_smooth (EMap *map)
EMapPrivate *priv;
GdkWindow *window;
int width, height;
- int win_width, win_height;
- int target_width, target_height;
double x, y;
g_return_if_fail (map);
@@ -1599,10 +1559,6 @@ zoom_in_smooth (EMap *map)
window = GTK_WIDGET (map)->window;
width = gdk_pixbuf_get_width (priv->map_render_pixbuf);
height = gdk_pixbuf_get_height (priv->map_render_pixbuf);
- win_width = GTK_WIDGET (map)->allocation.width;
- win_height = GTK_WIDGET (map)->allocation.height;
- target_width = win_width / 4;
- target_height = win_height / 4;
/* Center the target point as much as possible */
Index: misc/e-multi-config-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-multi-config-dialog.c,v
retrieving revision 1.34
diff -u -p -r1.34 e-multi-config-dialog.c
--- misc/e-multi-config-dialog.c 4 Aug 2005 04:56:54 -0000 1.34
+++ misc/e-multi-config-dialog.c 10 Dec 2005 22:09:39 -0000
@@ -185,11 +185,9 @@ static void
impl_response (GtkDialog *dialog, int response_id)
{
EMultiConfigDialog *multi_config_dialog;
- EMultiConfigDialogPrivate *priv;
GError *error;
multi_config_dialog = E_MULTI_CONFIG_DIALOG (dialog);
- priv = multi_config_dialog->priv;
error = NULL;
Index: misc/e-reflow.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-reflow.c,v
retrieving revision 1.61
diff -u -p -r1.61 e-reflow.c
--- misc/e-reflow.c 23 Jun 2005 09:11:10 -0000 1.61
+++ misc/e-reflow.c 10 Dec 2005 22:09:39 -0000
@@ -830,13 +830,11 @@ static void
e_reflow_realize (GnomeCanvasItem *item)
{
EReflow *reflow;
- GnomeCanvasGroup *group;
GtkAdjustment *adjustment;
int count;
int i;
reflow = E_REFLOW (item);
- group = GNOME_CANVAS_GROUP (item);
if (GNOME_CANVAS_ITEM_CLASS(parent_class)->realize)
(* GNOME_CANVAS_ITEM_CLASS(parent_class)->realize) (item);
@@ -951,7 +949,6 @@ e_reflow_event (GnomeCanvasItem *item, G
}
}
#endif
- break;
case GDK_BUTTON_PRESS:
switch(event->button.button)
{
Index: misc/e-search-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-search-bar.c,v
retrieving revision 1.88
diff -u -p -r1.88 e-search-bar.c
--- misc/e-search-bar.c 20 Sep 2005 09:34:12 -0000 1.88
+++ misc/e-search-bar.c 10 Dec 2005 22:09:39 -0000
@@ -106,14 +106,11 @@ verb_name_from_id (int id)
static void
clear_search (ESearchBar *esb)
{
- int item_row;
GtkWidget *widget;
ESearchBarSubitem *subitems;
e_search_bar_set_text (esb, "");
e_search_bar_set_item_id (esb, 0);
-
- item_row = find_id (esb->option_menu, 0, "EsbChoiceId", &widget);
subitems = g_object_get_data (G_OBJECT (widget), "EsbChoiceSubitems");
activate_by_subitems (esb, 0, subitems);
Index: misc/e-selection-model.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-selection-model.c,v
retrieving revision 1.22
diff -u -p -r1.22 e-selection-model.c
--- misc/e-selection-model.c 17 Jun 2005 15:20:33 -0000 1.22
+++ misc/e-selection-model.c 10 Dec 2005 22:09:39 -0000
@@ -601,11 +601,9 @@ e_selection_model_key_press (ESelec
case GDK_Up:
case GDK_KP_Up:
return move_selection(selection, TRUE, key->state);
- break;
case GDK_Down:
case GDK_KP_Down:
return move_selection(selection, FALSE, key->state);
- break;
case GDK_space:
case GDK_KP_Space:
if (selection->mode != GTK_SELECTION_SINGLE) {
Index: misc/e-send-options.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-send-options.c,v
retrieving revision 1.8
diff -u -p -r1.8 e-send-options.c
--- misc/e-send-options.c 24 Aug 2005 03:09:00 -0000 1.8
+++ misc/e-send-options.c 10 Dec 2005 22:09:39 -0000
@@ -328,12 +328,10 @@ delay_until_date_changed_cb (GtkWidget *
{
ESendOptionsDialog *sod;
ESendOptionsDialogPrivate *priv;
- ESendOptionsGeneral *gopts;
time_t tmp, current;
sod = data;
priv = sod->priv;
- gopts = sod->data->gopts;
current = time (NULL);
tmp = e_date_edit_get_time (E_DATE_EDIT (priv->delay_until));
@@ -559,8 +557,6 @@ e_sendoptions_get_need_general_options (
return sod->priv->gopts_needed;
}
-
-GtkWidget * send_options_make_dateedit (void);
GtkWidget *
send_options_make_dateedit (void)
Index: misc/e-unicode.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-unicode.c,v
retrieving revision 1.48
diff -u -p -r1.48 e-unicode.c
--- misc/e-unicode.c 17 Jun 2005 15:20:33 -0000 1.48
+++ misc/e-unicode.c 10 Dec 2005 22:09:40 -0000
@@ -2012,7 +2012,6 @@ e_stripped_char (gunichar ch)
case G_UNICODE_COMBINING_MARK:
/* Ignore those */
return 0;
- break;
default:
/* Convert to lowercase, fall through */
ch = g_unichar_tolower (ch);
Index: table/e-cell-progress.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-progress.c,v
retrieving revision 1.6
diff -u -p -r1.6 e-cell-progress.c
--- table/e-cell-progress.c 17 Jun 2005 15:20:34 -0000 1.6
+++ table/e-cell-progress.c 10 Dec 2005 22:09:40 -0000
@@ -110,7 +110,7 @@ eprog_clear (ECellProgress *progress)
static void
eprog_draw_border (ECellProgress *progress, guchar red, guchar green, guchar blue)
{
- gint i, j, w4, p4, pw4, wpb4, hp1;
+ gint i, j, w4, p4, pw4, wpb4;
/*
* some speedup
@@ -119,7 +119,6 @@ eprog_draw_border (ECellProgress *progre
p4=progress->padding*4;
pw4=w4*progress->padding;
wpb4=(progress->width-progress->padding-progress->border)*4;
- hp1=(progress->height-progress->padding-1);
for (i=progress->padding*4;i<(progress->width-progress->padding)*4;i+=4){
for (j=0;j<progress->border;j++){
@@ -172,37 +171,27 @@ eprog_draw (ECellView *ecell_view, GdkDr
int x1, int y1, int x2, int y2)
{
ECellProgress *progress = E_CELL_PROGRESS (ecell_view->ecell);
- gboolean selected;
- GdkPixbuf *image;
- int x, y, width, height;
+ int x, y;
const int value = GPOINTER_TO_INT (
e_table_model_value_at (ecell_view->e_table_model, model_col, row));
- selected = flags & E_CELL_SELECTED;
-
if ((value > progress->max)||(value < progress->min)){
g_warning ("Value from the table model is %d, the states we support are [%d..%d]\n",
value, progress->min, progress->max);
return;
}
- image = progress->image;
-
if ((x2 - x1) < progress->width){
x = x1;
- width = x2 - x1;
} else {
x = x1 + ((x2 - x1) - progress->width) / 2;
- width = progress->width;
}
if ((y2 - y1) < progress->height){
y = y1;
- height = y2 - y1;
} else {
y = y1 + ((y2 - y1) - progress->height) / 2;
- height = progress->height;
}
eprog_clear(progress);
@@ -267,7 +256,6 @@ eprog_event (ECellView *ecell_view, GdkE
default:
return FALSE;
}
- return TRUE;
}
/*
@@ -323,7 +311,7 @@ e_cell_progress_class_init (GObjectClass
parent_class = g_type_class_ref (PARENT_TYPE);
}
-E_MAKE_TYPE(e_cell_progress, "ECellProgress", ECellProgress, e_cell_progress_class_init, NULL, PARENT_TYPE);
+E_MAKE_TYPE(e_cell_progress, "ECellProgress", ECellProgress, e_cell_progress_class_init, NULL, PARENT_TYPE)
/**
* e_cell_progress_construct:
Index: table/e-cell-spin-button.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-spin-button.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-cell-spin-button.c
--- table/e-cell-spin-button.c 17 Jun 2005 15:20:34 -0000 1.11
+++ table/e-cell-spin-button.c 10 Dec 2005 22:09:40 -0000
@@ -338,7 +338,6 @@ ecsb_event (ECellView *ecv
ECellActions *actions)
{
ECellSpinButton *ecsb;
- ECellSpinButtonClass *ecsb_class;
ECellSpinButtonView *ecsb_view;
ETableItem *eti;
gint height, width;
@@ -347,7 +346,6 @@ ecsb_event (ECellView *ecv
ecsb_view = (ECellSpinButtonView *) ecv;
ecsb = E_CELL_SPIN_BUTTON (ecsb_view->cell_view.ecell);
- ecsb_class = E_CELL_SPIN_BUTTON_CLASS (GTK_OBJECT_GET_CLASS (ecsb));
eti = E_TABLE_ITEM (ecsb_view->cell_view.e_table_item_view);
switch (event->type) {
@@ -469,10 +467,7 @@ ecsb_focus (ECellView *ece
int y2)
{
ECellClass *klass;
- ECellSpinButtonView *ecsb_view;
- ecsb_view = (ECellSpinButtonView *) ecell_view;
-
klass = E_CELL_GET_CLASS (ecell_view->ecell);
if (klass->focus)
@@ -484,9 +479,7 @@ static void
ecsb_unfocus (ECellView *ecell_view)
{
ECellClass *klass;
- ECellSpinButtonView *ecsb_view;
- ecsb_view = (ECellSpinButtonView *) ecell_view;
klass = E_CELL_GET_CLASS (ecell_view->ecell);
if (klass->unfocus)
@@ -514,12 +507,8 @@ ecsb_show_tooltip (ECellView *ecv
static void
ecsb_dispose (GObject *object)
{
- ECellSpinButton *mcsp;
-
g_return_if_fail (object != NULL);
g_return_if_fail (M_IS_CELL_SPIN_BUTTON (object));
-
- mcsp = E_CELL_SPIN_BUTTON (object);
G_OBJECT_CLASS (parent_class)->dispose (object);
}
Index: table/e-cell-text.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-text.c,v
retrieving revision 1.142
diff -u -p -r1.142 e-cell-text.c
--- table/e-cell-text.c 23 Jun 2005 09:11:10 -0000 1.142
+++ table/e-cell-text.c 10 Dec 2005 22:09:40 -0000
@@ -704,7 +704,7 @@ ect_draw (ECellView *ecell_view, GdkDraw
ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
CellEdit *edit = text_view->edit;
gboolean selected;
- GdkColor *foreground, *cursor_color;
+ GdkColor *foreground;
GtkWidget *canvas = GTK_WIDGET (text_view->canvas);
GdkRectangle clip_rect;
int x_origin, y_origin;
@@ -716,10 +716,8 @@ ect_draw (ECellView *ecell_view, GdkDraw
foreground = &canvas->style->fg [GTK_STATE_SELECTED];
else
foreground = &canvas->style->fg [GTK_STATE_ACTIVE];
- cursor_color = foreground;
} else {
foreground = &canvas->style->text [GTK_STATE_NORMAL];
- cursor_color = foreground;
if (ect->color_column != -1) {
char *color_spec;
@@ -1542,6 +1540,10 @@ ect_show_tooltip (ECellView *ecell_view,
tooltip_height = height;
tooltip_y = tooltip->y;
+ /* This looks very broken since tooltip_x is never used?!
+ * Maybe tooltip->x is what was meant here and just get rid of
+ * both tooltip_x and tooltip_y?
+ */
switch (E_CELL_TEXT (text_view->cell_view.ecell)->justify) {
case GTK_JUSTIFY_CENTER:
tooltip_x = - tooltip_width / 2;
Index: table/e-cell-toggle.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-toggle.c,v
retrieving revision 1.44
diff -u -p -r1.44 e-cell-toggle.c
--- table/e-cell-toggle.c 23 Jun 2005 09:11:10 -0000 1.44
+++ table/e-cell-toggle.c 10 Dec 2005 22:09:40 -0000
@@ -189,7 +189,6 @@ etog_draw (ECellView *ecell_view, GdkDra
int x1, int y1, int x2, int y2)
{
ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell);
- gboolean selected;
ECellToggleView *toggle_view = (ECellToggleView *) ecell_view;
GdkPixmap *pixmap;
GdkPixbuf *image;
@@ -199,8 +198,6 @@ etog_draw (ECellView *ecell_view, GdkDra
const int value = GPOINTER_TO_INT (
e_table_model_value_at (ecell_view->e_table_model, model_col, row));
- selected = flags & E_CELL_SELECTED;
-
if (value < 0 || value >= toggle->n_states){
g_warning ("Value from the table model is %d, the states we support are [0..%d)\n",
value, toggle->n_states);
@@ -289,7 +286,6 @@ etog_event (ECellView *ecell_view, GdkEv
default:
return FALSE;
}
- return TRUE;
}
/*
Index: table/e-cell-tree.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-tree.c,v
retrieving revision 1.52
diff -u -p -r1.52 e-cell-tree.c
--- table/e-cell-tree.c 17 Jun 2005 15:20:34 -0000 1.52
+++ table/e-cell-tree.c 10 Dec 2005 22:09:40 -0000
@@ -574,7 +574,7 @@ ect_max_width (ECellView *ecell_view, in
ETreeModel *tree_model = e_cell_tree_get_tree_model(ecell_view->e_table_model, row);
ETreePath node;
GdkPixbuf *node_image;
- int node_image_width = 0, node_image_height = 0;
+ int node_image_width = 0;
int offset, subcell_offset;
#if 0
@@ -591,7 +591,6 @@ ect_max_width (ECellView *ecell_view, in
if (node_image) {
node_image_width = gdk_pixbuf_get_width (node_image);
- node_image_height = gdk_pixbuf_get_height (node_image);
}
width = subcell_offset + node_image_width;
Index: table/e-cell-vbox.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-vbox.c,v
retrieving revision 1.7
diff -u -p -r1.7 e-cell-vbox.c
--- table/e-cell-vbox.c 17 Jun 2005 15:20:34 -0000 1.7
+++ table/e-cell-vbox.c 10 Dec 2005 22:09:40 -0000
@@ -446,7 +446,7 @@ e_cell_vbox_init (GtkObject *object)
ecv->subcell_count = 0;
}
-E_MAKE_TYPE(e_cell_vbox, "ECellVbox", ECellVbox, e_cell_vbox_class_init, e_cell_vbox_init, PARENT_TYPE);
+E_MAKE_TYPE(e_cell_vbox, "ECellVbox", ECellVbox, e_cell_vbox_class_init, e_cell_vbox_init, PARENT_TYPE)
/**
* e_cell_vbox_new:
Index: table/e-table-click-to-add.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-click-to-add.c,v
retrieving revision 1.44
diff -u -p -r1.44 e-table-click-to-add.c
--- table/e-table-click-to-add.c 23 Jun 2005 09:11:10 -0000 1.44
+++ table/e-table-click-to-add.c 10 Dec 2005 22:09:40 -0000
@@ -433,7 +433,6 @@ etcta_event (GnomeCanvasItem *item, GdkE
break;
default:
return FALSE;
- break;
}
break;
Index: table/e-table-config.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-config.c,v
retrieving revision 1.72
diff -u -p -r1.72 e-table-config.c
--- table/e-table-config.c 24 Aug 2005 03:10:29 -0000 1.72
+++ table/e-table-config.c 10 Dec 2005 22:09:40 -0000
@@ -513,7 +513,7 @@ do_fields_config_dialog (ETableConfig *c
}
-ETableMemoryStoreColumnInfo store_columns[] = {
+static ETableMemoryStoreColumnInfo store_columns[] = {
E_TABLE_MEMORY_STORE_STRING,
E_TABLE_MEMORY_STORE_INTEGER,
E_TABLE_MEMORY_STORE_TERMINATOR
@@ -539,52 +539,13 @@ create_global_store (ETableConfig *confi
}
}
-char *spec = "<ETableSpecification gettext-domain=\"" E_I18N_DOMAIN "\" no-headers=\"true\" cursor-mode=\"line\" "
+static const char *spec = "<ETableSpecification gettext-domain=\"" E_I18N_DOMAIN "\" no-headers=\"true\" cursor-mode=\"line\" "
" draw-grid=\"false\" draw-focus=\"true\" selection-mode=\"browse\">"
"<ETableColumn model_col= \"0\" _title=\"Name\" minimum_width=\"30\" resizable=\"true\" cell=\"string\" compare=\"string\"/>"
"<ETableState> <column source=\"0\"/>"
"<grouping/>"
"</ETableState>"
"</ETableSpecification>";
-
-GtkWidget *e_table_proxy_etable_shown_new (void);
-
-GtkWidget *
-e_table_proxy_etable_shown_new (void)
-{
- ETableModel *model = NULL;
- GtkWidget *widget;
- ETableScrolled *ets;
-
- model = e_table_subset_variable_new (global_store);
-
- widget = e_table_scrolled_new (model, NULL, spec, NULL);
- ets = E_TABLE_SCROLLED (widget);
- atk_object_set_name (gtk_widget_get_accessible ((GtkWidget *)ets->table), _("Show Fields"));
-
- return widget;
-}
-
-GtkWidget *e_table_proxy_etable_available_new (void);
-
-GtkWidget *
-e_table_proxy_etable_available_new (void)
-{
- ETableModel *model;
- GtkWidget *widget;
- ETableScrolled *ets;
-
- model = e_table_without_new (global_store,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-
- e_table_without_show_all (E_TABLE_WITHOUT (model));
-
- widget = e_table_scrolled_new (model, NULL, spec, NULL);
- ets = E_TABLE_SCROLLED (widget);
- atk_object_set_name (gtk_widget_get_accessible ((GtkWidget *)ets->table), _("Available Fields"));
-
- return widget;
-}
static void
config_button_fields (GtkWidget *widget, ETableConfig *config)
Index: table/e-table-field-chooser-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-field-chooser-dialog.c,v
retrieving revision 1.17
diff -u -p -r1.17 e-table-field-chooser-dialog.c
--- table/e-table-field-chooser-dialog.c 17 Jun 2005 15:20:34 -0000 1.17
+++ table/e-table-field-chooser-dialog.c 10 Dec 2005 22:09:40 -0000
@@ -53,7 +53,7 @@ E_MAKE_TYPE (e_table_field_chooser_dialo
ETableFieldChooserDialog,
e_table_field_chooser_dialog_class_init,
e_table_field_chooser_dialog_init,
- PARENT_TYPE);
+ PARENT_TYPE)
static void
e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass)
Index: table/e-table-field-chooser-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-field-chooser-item.c,v
retrieving revision 1.24
diff -u -p -r1.24 e-table-field-chooser-item.c
--- table/e-table-field-chooser-item.c 23 Jun 2005 09:11:10 -0000 1.24
+++ table/e-table-field-chooser-item.c 10 Dec 2005 22:09:41 -0000
@@ -98,9 +98,6 @@ etfci_find_button (ETableFieldChooserIte
int i;
int count;
double height = 0;
- GtkStyle *style;
-
- style = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas)->style;
count = e_table_header_count(etfci->combined_header);
for (i = 0; i < count; i++) {
@@ -158,12 +155,9 @@ etfci_reflow (GnomeCanvasItem *item, gin
int i;
int count;
double height = 0;
- GtkStyle *style;
etfci_rebuild_combined (etfci);
- style = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas)->style;
-
old_height = etfci->height;
count = e_table_header_count(etfci->combined_header);
@@ -369,10 +363,8 @@ etfci_set_property (GObject *object, gui
static void
etfci_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- GnomeCanvasItem *item;
ETableFieldChooserItem *etfci;
- item = GNOME_CANVAS_ITEM (object);
etfci = E_TABLE_FIELD_CHOOSER_ITEM (object);
switch (prop_id){
@@ -423,13 +415,10 @@ static void
etfci_realize (GnomeCanvasItem *item)
{
ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
- GdkWindow *window;
if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)-> realize)
(*GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->realize)(item);
- window = GTK_WIDGET (item->canvas)->window;
-
if (!etfci->font)
etfci_font_load (etfci);
@@ -708,4 +697,4 @@ E_MAKE_TYPE (e_table_field_chooser_item,
ETableFieldChooserItem,
etfci_class_init,
etfci_init,
- PARENT_OBJECT_TYPE);
+ PARENT_OBJECT_TYPE)
Index: table/e-table-field-chooser.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-field-chooser.c,v
retrieving revision 1.23
diff -u -p -r1.23 e-table-field-chooser.c
--- table/e-table-field-chooser.c 17 Jun 2005 15:20:34 -0000 1.23
+++ table/e-table-field-chooser.c 10 Dec 2005 22:09:41 -0000
@@ -55,16 +55,14 @@ E_MAKE_TYPE (e_table_field_chooser,
ETableFieldChooser,
e_table_field_chooser_class_init,
e_table_field_chooser_init,
- PARENT_TYPE);
+ PARENT_TYPE)
static void
e_table_field_chooser_class_init (ETableFieldChooserClass *klass)
{
GObjectClass *object_class;
- GtkVBoxClass *vbox_class;
object_class = (GObjectClass*) klass;
- vbox_class = (GtkVBoxClass *) klass;
glade_init();
Index: table/e-table-group-container.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-group-container.c,v
retrieving revision 1.71
diff -u -p -r1.71 e-table-group-container.c
--- table/e-table-group-container.c 14 Oct 2005 11:12:48 -0000 1.71
+++ table/e-table-group-container.c 10 Dec 2005 22:09:41 -0000
@@ -332,10 +332,6 @@ etgc_realize (GnomeCanvasItem *item)
static void
etgc_unrealize (GnomeCanvasItem *item)
{
- ETableGroupContainer *etgc;
-
- etgc = E_TABLE_GROUP_CONTAINER (item);
-
if (GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->unrealize)
(* GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->unrealize) (item);
}
Index: table/e-table-group.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-group.c,v
retrieving revision 1.57
diff -u -p -r1.57 e-table-group.c
--- table/e-table-group.c 17 Jun 2005 15:20:34 -0000 1.57
+++ table/e-table-group.c 10 Dec 2005 22:09:41 -0000
@@ -111,7 +111,6 @@ e_table_group_new (GnomeCanvasGroup *par
} else {
return e_table_group_leaf_new (parent, full_header, header, model, sort_info);
}
- return NULL;
}
/**
Index: table/e-table-header-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-header-item.c,v
retrieving revision 1.132
diff -u -p -r1.132 e-table-header-item.c
--- table/e-table-header-item.c 23 Jun 2005 09:11:10 -0000 1.132
+++ table/e-table-header-item.c 10 Dec 2005 22:09:42 -0000
@@ -161,7 +161,6 @@ e_table_header_item_get_height (ETableHe
ETableHeader *eth;
int numcols, col;
int maxheight;
- GtkStyle *style;
g_return_val_if_fail (ethi != NULL, 0);
g_return_val_if_fail (E_IS_TABLE_HEADER_ITEM (ethi), 0);
@@ -171,8 +170,6 @@ e_table_header_item_get_height (ETableHe
maxheight = 0;
- style = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas)->style;
-
for (col = 0; col < numcols; col++) {
ETableCol *ecol = e_table_header_get_column (eth, col);
int height;
@@ -896,7 +893,6 @@ static void
ethi_realize (GnomeCanvasItem *item)
{
ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
- GdkWindow *window;
GtkTargetEntry ethi_drop_types [] = {
{ TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
};
@@ -905,8 +901,6 @@ ethi_realize (GnomeCanvasItem *item)
if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)-> realize)
(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->realize)(item);
- window = GTK_WIDGET (item->canvas)->window;
-
if (!ethi->font)
ethi_font_set (ethi, gtk_style_get_font (GTK_WIDGET (item->canvas)->style));
@@ -1722,10 +1716,10 @@ ethi_event (GnomeCanvasItem *item, GdkEv
needs_ungrab = (ethi->resize_guide != NULL);
ethi_end_resize (ethi);
} else if (was_maybe_drag && ethi->sort_info) {
- ETableCol *col;
+ ETableCol *ecol;
- col = e_table_header_get_column (ethi->eth, ethi_find_col_by_x (ethi, e->button.x));
- ethi_change_sort_state (ethi, col);
+ ecol = e_table_header_get_column (ethi->eth, ethi_find_col_by_x (ethi, e->button.x));
+ ethi_change_sort_state (ethi, ecol);
}
if (needs_ungrab)
@@ -1736,16 +1730,16 @@ ethi_event (GnomeCanvasItem *item, GdkEv
case GDK_KEY_PRESS:
if ((e->key.keyval == GDK_F10) && (e->key.state & GDK_SHIFT_MASK)) {
EthiHeaderInfo *info = g_new(EthiHeaderInfo, 1);
- ETableCol *col;
+ ETableCol *ecol;
GtkMenu *popup;
info->ethi = ethi;
info->col = ethi->selected_col;
- col = e_table_header_get_column (ethi->eth, info->col);
+ ecol = e_table_header_get_column (ethi->eth, info->col);
popup = e_popup_menu_create_with_domain (ethi_context_menu,
1 +
- (col->sortable ? 0 : 2) +
+ (ecol->sortable ? 0 : 2) +
((ethi->table || ethi->tree) ? 0 : 4) +
((e_table_header_count (ethi->eth) > 1) ? 0 : 8),
((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) +
@@ -1756,28 +1750,28 @@ ethi_event (GnomeCanvasItem *item, GdkEv
G_CALLBACK (free_popup_info), info);
e_popup_menu (popup, NULL);
} else if (e->key.keyval == GDK_space) {
- ETableCol *col;
+ ETableCol *ecol;
- col = e_table_header_get_column (ethi->eth, ethi->selected_col);
- ethi_change_sort_state (ethi, col);
+ ecol = e_table_header_get_column (ethi->eth, ethi->selected_col);
+ ethi_change_sort_state (ethi, ecol);
} else if ((e->key.keyval == GDK_Right) || (e->key.keyval == GDK_KP_Right)) {
- ETableCol *col;
+ ETableCol *ecol;
if ((ethi->selected_col < 0) || (ethi->selected_col >= ethi->eth->col_count - 1))
ethi->selected_col = 0;
else
ethi->selected_col++;
- col = e_table_header_get_column (ethi->eth, ethi->selected_col);
- ethi_change_sort_state (ethi, col);
+ ecol = e_table_header_get_column (ethi->eth, ethi->selected_col);
+ ethi_change_sort_state (ethi, ecol);
} else if ((e->key.keyval == GDK_Left) || (e->key.keyval == GDK_KP_Left)) {
- ETableCol *col;
+ ETableCol *ecol;
if ((ethi->selected_col <= 0) || (ethi->selected_col >= ethi->eth->col_count))
ethi->selected_col = ethi->eth->col_count - 1;
else
ethi->selected_col--;
- col = e_table_header_get_column (ethi->eth, ethi->selected_col);
- ethi_change_sort_state (ethi, col);
+ ecol = e_table_header_get_column (ethi->eth, ethi->selected_col);
+ ethi_change_sort_state (ethi, ecol);
}
break;
Index: table/e-table-header-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-header-utils.c,v
retrieving revision 1.20
diff -u -p -r1.20 e-table-header-utils.c
--- table/e-table-header-utils.c 23 Jun 2005 09:11:10 -0000 1.20
+++ table/e-table-header-utils.c 10 Dec 2005 22:09:42 -0000
@@ -294,10 +294,6 @@ e_table_draw_elided_string (GdkDrawable
gdk_draw_layout (drawable, gc, x, y, layout);
for (i = 0; i < arrow_width; i++) {
- int h;
-
- h = 2 * i + 1;
-
gdk_draw_line (drawable, gc,
x + max_width - i,
y + height / 2 - i,
@@ -435,7 +431,6 @@ e_table_header_draw_button (GdkDrawable
xpos = inner_x;
if (inner_width - pwidth > 11) {
- int width;
int ypos;
pango_layout_get_pixel_size (layout, &width, NULL);
Index: table/e-table-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-item.c,v
retrieving revision 1.243
diff -u -p -r1.243 e-table-item.c
--- table/e-table-item.c 25 Aug 2005 06:54:58 -0000 1.243
+++ table/e-table-item.c 10 Dec 2005 22:09:42 -0000
@@ -1460,11 +1460,9 @@ eti_dispose (GObject *object)
static void
eti_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
- GnomeCanvasItem *item;
ETableItem *eti;
int cursor_col;
- item = GNOME_CANVAS_ITEM (object);
eti = E_TABLE_ITEM (object);
switch (prop_id){
@@ -1546,11 +1544,9 @@ eti_set_property (GObject *object, guint
static void
eti_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- GnomeCanvasItem *item;
ETableItem *eti;
int row;
- item = GNOME_CANVAS_ITEM (object);
eti = E_TABLE_ITEM (object);
switch (prop_id){
@@ -1920,7 +1916,7 @@ eti_draw (GnomeCanvasItem *item, GdkDraw
yd += height_extra;
for (row = first_row; row < last_row; row++){
- int xd, height;
+ int xd;
gboolean selected;
gint cursor_col, cursor_row;
@@ -2389,7 +2385,6 @@ eti_event (GnomeCanvasItem *item, GdkEve
case 4:
case 5:
return FALSE;
- break;
}
break;
@@ -2473,7 +2468,6 @@ eti_event (GnomeCanvasItem *item, GdkEve
case 4:
case 5:
return FALSE;
- break;
}
break;
@@ -3204,13 +3198,11 @@ static void
eti_cursor_change (ESelectionModel *selection, int row, int col, ETableItem *eti)
{
int view_row;
- int view_col;
if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
return;
view_row = model_to_view_row(eti, row);
- view_col = model_to_view_col(eti, col);
if (eti->old_cursor_row != -1 && view_row != eti->old_cursor_row)
e_table_item_redraw_row (eti, eti->old_cursor_row);
Index: table/e-table-scrolled.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-scrolled.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-table-scrolled.c
--- table/e-table-scrolled.c 17 Jun 2005 15:20:34 -0000 1.21
+++ table/e-table-scrolled.c 10 Dec 2005 22:09:42 -0000
@@ -205,11 +205,9 @@ e_table_scrolled_class_init (ETableScrol
{
GObjectClass *object_class;
GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
object_class = (GObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
- container_class = (GtkContainerClass *) class;
parent_class = g_type_class_ref (PARENT_TYPE);
Index: table/e-table-search.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-search.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-table-search.c
--- table/e-table-search.c 17 Jun 2005 15:20:34 -0000 1.11
+++ table/e-table-search.c 10 Dec 2005 22:09:42 -0000
@@ -31,7 +31,7 @@
#define d(x)
-d(static gint depth = 0);
+d(static gint depth = 0)
struct _ETableSearchPrivate {
guint timeout_id;
Index: table/e-table-sort-info.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-sort-info.c,v
retrieving revision 1.27
diff -u -p -r1.27 e-table-sort-info.c
--- table/e-table-sort-info.c 17 Jun 2005 15:20:34 -0000 1.27
+++ table/e-table-sort-info.c 10 Dec 2005 22:09:42 -0000
@@ -418,7 +418,6 @@ e_table_sort_info_save_to_node (ETableSo
xmlNode *parent)
{
xmlNode *grouping;
- xmlNode *node;
int i;
const int sort_count = e_table_sort_info_sorting_get_count (info);
const int group_count = e_table_sort_info_grouping_get_count (info);
@@ -431,7 +430,6 @@ e_table_sort_info_save_to_node (ETableSo
e_xml_set_integer_prop_by_name (new_node, "column", column.column);
e_xml_set_bool_prop_by_name (new_node, "ascending", column.ascending);
- node = new_node;
}
for (i = 0; i < sort_count; i++) {
@@ -440,7 +438,6 @@ e_table_sort_info_save_to_node (ETableSo
e_xml_set_integer_prop_by_name (new_node, "column", column.column);
e_xml_set_bool_prop_by_name (new_node, "ascending", column.ascending);
- node = new_node;
}
return grouping;
Index: table/e-table.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table.c,v
retrieving revision 1.239
diff -u -p -r1.239 e-table.c
--- table/e-table.c 29 Sep 2005 18:00:17 -0000 1.239
+++ table/e-table.c 10 Dec 2005 22:09:42 -0000
@@ -682,7 +682,6 @@ static gboolean
table_canvas_reflow_idle (ETable *e_table)
{
gdouble height, width;
- gdouble item_height;
gdouble oldheight, oldwidth;
GtkAllocation *alloc = &(GTK_WIDGET (e_table->table_canvas)->allocation);
@@ -690,7 +689,6 @@ table_canvas_reflow_idle (ETable *e_tabl
"height", &height,
"width", &width,
NULL);
- item_height = height;
height = MAX ((int)height, alloc->height);
width = MAX((int)width, alloc->width);
/* I have no idea why this needs to be -1, but it works. */
@@ -713,7 +711,6 @@ table_canvas_size_allocate (GtkWidget *w
{
gdouble width;
gdouble height;
- gdouble item_height;
GValue *val = g_new0 (GValue, 1);
g_value_init (val, G_TYPE_DOUBLE);
@@ -722,7 +719,6 @@ table_canvas_size_allocate (GtkWidget *w
g_object_get (e_table->canvas_vbox,
"height", &height,
NULL);
- item_height = height;
height = MAX ((int)height, alloc->height);
g_object_set (e_table->canvas_vbox,
@@ -1139,9 +1135,6 @@ table_canvas_focus_event_cb (GtkWidget *
static gboolean
canvas_vbox_event (ECanvasVbox *vbox, GdkEventKey *key, ETable *etable)
{
- GnomeCanvas *canvas;
-
- canvas = GNOME_CANVAS (etable->table_canvas);
switch (key->keyval) {
case GDK_Tab:
case GDK_KP_Tab:
@@ -1160,9 +1153,6 @@ canvas_vbox_event (ECanvasVbox *vbox, Gd
static gboolean
click_to_add_event (ETableClickToAdd *etcta, GdkEventKey *key, ETable *etable)
{
- GnomeCanvas *canvas;
-
- canvas = GNOME_CANVAS (etable->table_canvas);
switch (key->keyval) {
case GDK_Tab:
case GDK_KP_Tab:
@@ -2463,9 +2453,9 @@ struct _GtkDragDestInfo
GdkDragContext *context; /* Drag context */
GtkDragSourceInfo *proxy_source; /* Set if this is a proxy drag */
GtkSelectionData *proxy_data; /* Set while retrieving proxied data */
- gboolean dropped : 1; /* Set after we receive a drop */
+ guint dropped : 1; /* Set after we receive a drop */
guint32 proxy_drop_time; /* Timestamp for proxied drop */
- gboolean proxy_drop_wait : 1; /* Set if we are waiting for a
+ guint proxy_drop_wait : 1; /* Set if we are waiting for a
* status reply before sending
* a proxied drop on.
*/
@@ -2847,9 +2837,6 @@ do_drag_motion(ETable *et,
{
gboolean ret_val;
int row = -1, col = -1;
- GtkWidget *widget;
-
- widget = GTK_WIDGET (et);
e_table_get_cell_at (et, x, y, &row, &col);
@@ -3060,11 +3047,9 @@ e_table_class_init (ETableClass *class)
{
GObjectClass *object_class;
GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
object_class = (GObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
- container_class = (GtkContainerClass *) class;
parent_class = g_type_class_peek_parent (class);
Index: table/e-tree-scrolled.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-tree-scrolled.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-tree-scrolled.c
--- table/e-tree-scrolled.c 17 Jun 2005 15:20:34 -0000 1.11
+++ table/e-tree-scrolled.c 10 Dec 2005 22:09:42 -0000
@@ -204,11 +204,9 @@ e_tree_scrolled_class_init (ETreeScrolle
{
GObjectClass *object_class;
GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
object_class = (GObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
- container_class = (GtkContainerClass *) class;
parent_class = g_type_class_ref (PARENT_TYPE);
Index: table/e-tree.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-tree.c,v
retrieving revision 1.117
diff -u -p -r1.117 e-tree.c
--- table/e-tree.c 7 Dec 2005 09:48:08 -0000 1.117
+++ table/e-tree.c 10 Dec 2005 22:09:43 -0000
@@ -713,7 +713,6 @@ static gboolean
tree_canvas_reflow_idle (ETree *e_tree)
{
gdouble height, width;
- gdouble item_height;
gdouble oldheight, oldwidth;
GtkAllocation *alloc = &(GTK_WIDGET (e_tree->priv->table_canvas)->allocation);
@@ -721,7 +720,6 @@ tree_canvas_reflow_idle (ETree *e_tree)
"height", &height,
"width", &width,
NULL);
- item_height = height;
height = MAX ((int)height, alloc->height);
width = MAX((int)width, alloc->width);
/* I have no idea why this needs to be -1, but it works. */
@@ -744,7 +742,6 @@ tree_canvas_size_allocate (GtkWidget *wi
{
gdouble width;
gdouble height;
- gdouble item_height;
GtkAdjustment *adj = GTK_LAYOUT(e_tree->priv->table_canvas)->vadjustment;
ETreePath path = e_tree_get_cursor (e_tree);
gint x, y, w, h;
@@ -756,7 +753,6 @@ tree_canvas_size_allocate (GtkWidget *wi
g_object_get (e_tree->priv->item,
"height", &height,
NULL);
- item_height = height;
height = MAX ((int)height, alloc->height);
g_object_set (e_tree->priv->item,
@@ -2199,9 +2195,9 @@ struct _GtkDragDestInfo
GdkDragContext *context; /* Drag context */
GtkDragSourceInfo *proxy_source; /* Set if this is a proxy drag */
GtkSelectionData *proxy_data; /* Set while retrieving proxied data */
- gboolean dropped : 1; /* Set after we receive a drop */
+ guint dropped : 1; /* Set after we receive a drop */
guint32 proxy_drop_time; /* Timestamp for proxied drop */
- gboolean proxy_drop_wait : 1; /* Set if we are waiting for a
+ guint proxy_drop_wait : 1; /* Set if we are waiting for a
* status reply before sending
* a proxied drop on.
*/
@@ -2246,12 +2242,9 @@ e_tree_drag_get_data (ETree *tre
GdkAtom target,
guint32 time)
{
- ETreePath path;
g_return_if_fail(tree != NULL);
g_return_if_fail(E_IS_TREE(tree));
- path = e_tree_table_adapter_node_at_row(tree->priv->etta, row);
-
gtk_drag_get_data(GTK_WIDGET(tree),
context,
target,
@@ -2627,9 +2620,6 @@ do_drag_motion(ETree *et,
gboolean ret_val = FALSE;
int row, col;
ETreePath path;
- GtkWidget *widget;
-
- widget = GTK_WIDGET (et);
e_tree_get_cell_at (et,
x,
@@ -3002,11 +2992,9 @@ e_tree_class_init (ETreeClass *class)
{
GObjectClass *object_class;
GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
object_class = (GObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
- container_class = (GtkContainerClass *) class;
parent_class = g_type_class_ref (PARENT_TYPE);
Index: text/e-text.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/text/e-text.c,v
retrieving revision 1.164
diff -u -p -r1.164 e-text.c
--- text/e-text.c 23 Jun 2005 09:11:11 -0000 1.164
+++ text/e-text.c 10 Dec 2005 22:09:43 -0000
@@ -654,7 +654,6 @@ e_text_set_property (GObject *object,
GdkColor color = { 0, 0, 0, 0, };
GdkColor *pcolor;
gboolean color_changed;
- int have_pixel;
gboolean needs_update = 0;
gboolean needs_reflow = 0;
@@ -663,7 +662,6 @@ e_text_set_property (GObject *object,
text = E_TEXT (object);
color_changed = FALSE;
- have_pixel = FALSE;
switch (prop_id) {
case PROP_MODEL:
@@ -1370,7 +1368,7 @@ e_text_draw (GnomeCanvasItem *item, GdkD
gdouble thisx = item->x1 - x;
gdouble thisy = item->y1 - y;
gdouble thiswidth, thisheight;
- GtkWidget *widget = GTK_WIDGET(item->canvas);
+ widget = GTK_WIDGET(item->canvas);
g_object_get(text,
"width", &thiswidth,
@@ -1397,7 +1395,6 @@ e_text_draw (GnomeCanvasItem *item, GdkD
}
}
if (text->draw_button) {
- GtkWidget *widget;
int xoff = item->x1 - x;
int yoff = item->y1 - y;
@@ -1931,11 +1928,11 @@ _do_tooltip (gpointer data)
cut_off = FALSE;
for ( i = 0; i < text->num_lines; i++ ) {
PangoLayoutLine *line = pango_layout_get_line (text->layout, i);
- PangoRectangle rect;
+ PangoRectangle pango_rect;
- pango_layout_line_get_pixel_extents (line, &rect, NULL);
+ pango_layout_line_get_pixel_extents (line, &pango_rect, NULL);
- if (rect.width > text->clip_width) {
+ if (pango_rect.width > text->clip_width) {
cut_off = TRUE;
break;
}
@@ -2544,7 +2541,7 @@ static void
primary_clear_cb (GtkClipboard *clipboard,
gpointer data)
{
-#if notyet
+#ifdef notyet
/* XXX */
gtk_editable_select_region (GTK_EDITABLE (entry), entry->current_pos, entry->current_pos);
#endif
@@ -2941,7 +2938,6 @@ _get_position(EText *text, ETextEventPro
case E_TEP_FORWARD_LINE: {
int offset_into_line;
- char *p;
offset_into_line = find_offset_into_line (text, text->selection_end, NULL);
if (offset_into_line == -1)
@@ -2972,7 +2968,6 @@ _get_position(EText *text, ETextEventPro
break;
}
case E_TEP_BACKWARD_LINE: {
- char *p;
int offset_into_line = find_offset_into_line (text, text->selection_end, &p);
if (offset_into_line == -1)
@@ -3313,12 +3308,12 @@ e_text_command(ETextEventProcessor *tep,
if (cur_line) {
int xpos, ypos;
double clip_width, clip_height;
- gboolean trailing = FALSE;
+ /* gboolean trailing = FALSE; */
PangoRectangle pango_pos;
if (selection_index > 0 && selection_index == cur_line->start_index + cur_line->length) {
selection_index--;
- trailing = TRUE;
+ /* trailing = TRUE; */
}
pango_layout_index_to_pos (text->layout, selection_index, &pango_pos);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
