Cleanups for eel
- From: Kjartan Maraas <kmaraas broadpark no>
- To: Nautilus List <nautilus-list gnome org>
- Subject: Cleanups for eel
- Date: Mon, 24 Oct 2005 22:23:28 +0200
This patch has a lot of cleanups which remove compiler warnings, remove
dead code etc.
Cheers
Kjartan
? INSTALL
? depcomp
? eel-2.0-uninstalled.pc
? install-sh
? leaks
? missing
? mkinstalldirs
? stamp-h1
? warnings
Index: eel/eel-art-gtk-extensions.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-art-gtk-extensions.c,v
retrieving revision 1.6
diff -u -p -r1.6 eel-art-gtk-extensions.c
--- eel/eel-art-gtk-extensions.c 7 Feb 2002 00:26:18 -0000 1.6
+++ eel/eel-art-gtk-extensions.c 24 Oct 2005 20:18:55 -0000
@@ -207,7 +207,6 @@ eel_gdk_window_clip_dirty_area_to_screen
{
ArtIRect clipped;
EelDimensions screen_dimensions;
- ArtIRect bounds;
ArtIRect screen_relative_bounds;
int dirty_width;
int dirty_height;
@@ -221,7 +220,6 @@ eel_gdk_window_clip_dirty_area_to_screen
g_return_val_if_fail (dirty_height > 0, eel_art_irect_empty);
screen_dimensions = eel_screen_get_dimensions ();
- bounds = eel_gdk_window_get_bounds (gdk_window);
screen_relative_bounds = eel_gdk_window_get_screen_relative_bounds (gdk_window);
/* Window is obscured by left edge of screen */
Index: eel/eel-background.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-background.c,v
retrieving revision 1.46
diff -u -p -r1.46 eel-background.c
--- eel/eel-background.c 16 Mar 2005 08:29:15 -0000 1.46
+++ eel/eel-background.c 24 Oct 2005 20:18:55 -0000
@@ -165,10 +165,8 @@ static void
eel_background_class_init (gpointer klass)
{
GObjectClass *object_class;
- EelBackgroundClass *background_class;
object_class = G_OBJECT_CLASS (klass);
- background_class = EEL_BACKGROUND_CLASS (klass);
eel_type_init ();
Index: eel/eel-canvas.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-canvas.c,v
retrieving revision 1.13
diff -u -p -r1.13 eel-canvas.c
--- eel/eel-canvas.c 21 Oct 2004 10:42:17 -0000 1.13
+++ eel/eel-canvas.c 24 Oct 2005 20:18:56 -0000
@@ -196,10 +196,6 @@ eel_canvas_item_new (EelCanvasGroup *par
static void
item_post_create_setup (EelCanvasItem *item)
{
- GtkObject *obj;
-
- obj = GTK_OBJECT (item);
-
group_add (EEL_CANVAS_GROUP (item->parent), item);
redraw_and_repick_if_mapped (item);
@@ -1305,12 +1301,10 @@ static void
eel_canvas_group_get_property (GObject *gobject, guint param_id,
GValue *value, GParamSpec *pspec)
{
- EelCanvasItem *item;
EelCanvasGroup *group;
g_return_if_fail (EEL_IS_CANVAS_GROUP (gobject));
- item = EEL_CANVAS_ITEM (gobject);
group = EEL_CANVAS_GROUP (gobject);
switch (param_id) {
@@ -2639,9 +2633,6 @@ pick_current_item (EelCanvas *canvas, Gd
&& (canvas->current_item != NULL)
&& !canvas->left_grabbed_item) {
GdkEvent new_event;
- EelCanvasItem *item;
-
- item = canvas->current_item;
new_event = canvas->pick_event;
new_event.type = GDK_LEAVE_NOTIFY;
Index: eel/eel-editable-label.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-editable-label.c,v
retrieving revision 1.15
diff -u -p -r1.15 eel-editable-label.c
--- eel/eel-editable-label.c 24 Jan 2005 11:23:03 -0000 1.15
+++ eel/eel-editable-label.c 24 Oct 2005 20:18:56 -0000
@@ -986,7 +986,6 @@ eel_editable_label_ensure_layout (EelEdi
{
GtkWidget *widget;
PangoRectangle logical_rect;
- gint rwidth, rheight;
/* Normalize for comparisons */
include_preedit = include_preedit != 0;
@@ -997,9 +996,6 @@ eel_editable_label_ensure_layout (EelEdi
widget = GTK_WIDGET (label);
- rwidth = label->misc.xpad * 2;
- rheight = label->misc.ypad * 2;
-
if (label->layout == NULL)
{
gchar *preedit_string = NULL;
@@ -1193,10 +1189,6 @@ static void
eel_editable_label_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- EelEditableLabel *label;
-
- label = EEL_EDITABLE_LABEL (widget);
-
(* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
}
@@ -1660,20 +1652,12 @@ eel_editable_label_unrealize (GtkWidget
static void
eel_editable_label_map (GtkWidget *widget)
{
- EelEditableLabel *label;
-
- label = EEL_EDITABLE_LABEL (widget);
-
(* GTK_WIDGET_CLASS (parent_class)->map) (widget);
}
static void
eel_editable_label_unmap (GtkWidget *widget)
{
- EelEditableLabel *label;
-
- label = EEL_EDITABLE_LABEL (widget);
-
(* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
}
@@ -1683,10 +1667,7 @@ window_to_layout_coords (EelEditableLabe
gint *y)
{
gint lx, ly;
- GtkWidget *widget;
- widget = GTK_WIDGET (label);
-
/* get layout location in widget->window coords */
get_layout_location (label, &lx, &ly);
@@ -1851,10 +1832,6 @@ eel_editable_label_button_release (GtkWi
GdkEventButton *event)
{
- EelEditableLabel *label;
-
- label = EEL_EDITABLE_LABEL (widget);
-
if (event->button != 1)
return FALSE;
@@ -2585,8 +2562,6 @@ eel_editable_label_move_line (EelEditabl
else
return line->start_index + line->length - 1;
}
-
- return start;
}
static gint
@@ -2625,9 +2600,6 @@ eel_editable_label_move_backward_word (E
{
gint new_pos = g_utf8_pointer_to_offset (label->text,
label->text + start);
- gint length;
-
- length = g_utf8_strlen (label->text, -1);
if (new_pos > 0)
{
Index: eel/eel-ellipsizing-label.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-ellipsizing-label.c,v
retrieving revision 1.13
diff -u -p -r1.13 eel-ellipsizing-label.c
--- eel/eel-ellipsizing-label.c 26 Apr 2002 08:57:09 -0000 1.13
+++ eel/eel-ellipsizing-label.c 24 Oct 2005 20:18:56 -0000
@@ -134,11 +134,8 @@ real_size_allocate (GtkWidget *widget, G
static gboolean
real_expose_event (GtkWidget *widget, GdkEventExpose *event)
{
- EelEllipsizingLabel *label;
GtkRequisition req;
- label = EEL_ELLIPSIZING_LABEL (widget);
-
/* push/pop the actual size so expose draws in the right
* place, yes this is bad hack central. Here we assume the
* ellipsized text has been set on the layout in size_allocate
Index: eel/eel-gconf-extensions.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-gconf-extensions.c,v
retrieving revision 1.13
diff -u -p -r1.13 eel-gconf-extensions.c
--- eel/eel-gconf-extensions.c 11 Jan 2004 19:07:26 -0000 1.13
+++ eel/eel-gconf-extensions.c 24 Oct 2005 20:18:56 -0000
@@ -451,22 +451,18 @@ simple_value_is_equal (const GConfValue
case GCONF_VALUE_STRING:
return eel_str_is_equal (gconf_value_get_string (a),
gconf_value_get_string (b));
- break;
case GCONF_VALUE_INT:
return gconf_value_get_int (a) ==
gconf_value_get_int (b);
- break;
case GCONF_VALUE_FLOAT:
return gconf_value_get_float (a) ==
gconf_value_get_float (b);
- break;
case GCONF_VALUE_BOOL:
return gconf_value_get_bool (a) ==
gconf_value_get_bool (b);
- break;
default:
g_assert_not_reached ();
}
Index: eel/eel-gdk-pixbuf-extensions.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-gdk-pixbuf-extensions.c,v
retrieving revision 1.36
diff -u -p -r1.36 eel-gdk-pixbuf-extensions.c
--- eel/eel-gdk-pixbuf-extensions.c 5 Feb 2003 18:30:31 -0000 1.36
+++ eel/eel-gdk-pixbuf-extensions.c 24 Oct 2005 20:18:56 -0000
@@ -296,7 +296,7 @@ eel_gdk_pixbuf_average_value (GdkPixbuf
int row_stride;
const guchar *pixels, *p;
int r, g, b, a;
- guint dividend;
+ guint64 dividend;
guint width, height;
width = gdk_pixbuf_get_width (pixbuf);
Index: eel/eel-image-table.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-image-table.c,v
retrieving revision 1.19
diff -u -p -r1.19 eel-image-table.c
--- eel/eel-image-table.c 10 Mar 2002 05:07:23 -0000 1.19
+++ eel/eel-image-table.c 24 Oct 2005 20:18:56 -0000
@@ -203,13 +203,10 @@ eel_image_table_finalize (GObject *objec
static void
eel_image_table_realize (GtkWidget *widget)
{
- EelImageTable *image_table;
GtkWidget *windowed_ancestor;
g_return_if_fail (EEL_IS_IMAGE_TABLE (widget));
- image_table = EEL_IMAGE_TABLE (widget);
-
/* Chain realize */
EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
@@ -318,7 +315,6 @@ image_table_emit_signal (EelImageTable *
g_return_if_fail (EEL_IS_IMAGE_TABLE (image_table));
g_return_if_fail (GTK_IS_WIDGET (child));
- g_return_if_fail (signal_index >= 0);
g_return_if_fail (signal_index < LAST_SIGNAL);
event.x = x;
Index: eel/eel-mime-application-chooser.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-mime-application-chooser.c,v
retrieving revision 1.10
diff -u -p -r1.10 eel-mime-application-chooser.c
--- eel/eel-mime-application-chooser.c 19 Jul 2005 08:08:18 -0000 1.10
+++ eel/eel-mime-application-chooser.c 24 Oct 2005 20:18:56 -0000
@@ -101,10 +101,6 @@ eel_mime_application_chooser_finalize (G
static void
eel_mime_application_chooser_destroy (GtkObject *object)
{
- EelMimeApplicationChooser *chooser;
-
- chooser = EEL_MIME_APPLICATION_CHOOSER (object);
-
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
Index: eel/eel-open-with-dialog.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-open-with-dialog.c,v
retrieving revision 1.16
diff -u -p -r1.16 eel-open-with-dialog.c
--- eel/eel-open-with-dialog.c 19 Jul 2005 08:08:18 -0000 1.16
+++ eel/eel-open-with-dialog.c 24 Oct 2005 20:18:56 -0000
@@ -132,10 +132,6 @@ eel_open_with_dialog_finalize (GObject *
static void
eel_open_with_dialog_destroy (GtkObject *object)
{
- EelOpenWithDialog *dialog;
-
- dialog = EEL_OPEN_WITH_DIALOG (object);
-
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
Index: eel/eel-pango-extensions.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-pango-extensions.c,v
retrieving revision 1.17
diff -u -p -r1.17 eel-pango-extensions.c
--- eel/eel-pango-extensions.c 17 May 2002 01:17:10 -0000 1.17
+++ eel/eel-pango-extensions.c 24 Oct 2005 20:18:57 -0000
@@ -454,7 +454,6 @@ eel_pango_layout_set_text_ellipsized (Pa
break;
default:
g_return_if_reached ();
- s = NULL;
}
pango_layout_set_text (layout, s, -1);
Index: eel/eel-stock-dialogs.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-stock-dialogs.c,v
retrieving revision 1.28
diff -u -p -r1.28 eel-stock-dialogs.c
--- eel/eel-stock-dialogs.c 24 Jan 2005 11:23:04 -0000 1.28
+++ eel/eel-stock-dialogs.c 24 Oct 2005 20:18:57 -0000
@@ -120,7 +120,7 @@ static void
timed_wait_free (TimedWait *wait)
{
guint delayed_close_handler_id;
- guint32 time_up;
+ guint64 time_up;
g_assert (g_hash_table_lookup (timed_wait_hash_table, wait) != NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]