aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/misc/ChangeLog13
-rw-r--r--widgets/misc/e-calendar-item.c6
-rw-r--r--widgets/misc/e-canvas-background.c2
-rw-r--r--widgets/misc/e-colors.c13
-rw-r--r--widgets/misc/e-filter-bar.c4
-rw-r--r--widgets/misc/e-search-bar.c2
-rw-r--r--widgets/misc/gal-combo-box.c2
7 files changed, 19 insertions, 23 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 9d52ca2f87..7430cbfa34 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,16 @@
+2006-12-04 Matthew Barnes <mbarnes@redhat.com>
+
+ Fixes bug #357970
+
+ * e-calendar-item.c:
+ * e-canvas-background.c:
+ * e-filter-bar.c:
+ * e-search-bar.c:
+ * gal-combo-box.c:
+ Don't call deprecated GLib / GDK functions.
+
+ * e-colors.c (e_color_alloc): Remove unused function.
+
2006-12-04 Harish Krishnaswamy <kharish@novell.com>
* e-filter-bar.c: (build_items): Fix read of uninitialized
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 77b041c5f9..59eac4f119 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -700,11 +700,7 @@ e_calendar_item_unrealize (GnomeCanvasItem *item)
colormap = gtk_widget_get_colormap (GTK_WIDGET (item->canvas));
- for (i = 0; i < E_CALENDAR_ITEM_COLOR_LAST; i++) {
- /* FIXME: gdk_colors_free expects gulong* here but the pixel value in GdkColor
- is guint32. GDK bug? */
- gdk_colors_free (colormap, (gulong *) &calitem->colors[i].pixel, 1, 0);
- }
+ gdk_colormap_free_colors (colormap, calitem->colors, E_CALENDAR_ITEM_COLOR_LAST);
if (GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->unrealize)
(* GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->unrealize) (item);
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index b2738847b7..58bda2436d 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -358,7 +358,7 @@ ecb_unrealize (GnomeCanvasItem *item)
{
ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item);
- gdk_gc_unref (ecb->priv->gc);
+ g_object_unref (ecb->priv->gc);
ecb->priv->gc = NULL;
if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c
index 3db1aac633..d3fb34e322 100644
--- a/widgets/misc/e-colors.c
+++ b/widgets/misc/e-colors.c
@@ -33,19 +33,6 @@
GdkColor e_white, e_dark_gray, e_black;
-gulong
-e_color_alloc (gushort red, gushort green, gushort blue)
-{
- e_color_init ();
-
- red >>= 8;
- green >>= 8;
- blue >>= 8;
- return gdk_rgb_xpixel_from_rgb (
- ((red & 0xff) << 16) | ((green & 0xff) << 8) |
- (blue & 0xff));
-}
-
void
e_color_alloc_gdk (GtkWidget *widget, GdkColor *c)
{
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index c80f551d1e..1142b8ccc6 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -567,7 +567,7 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp
GString *out = g_string_new ("");
filter_rule_build_code (efb->current_query, out);
- g_value_set_string_take_ownership (value, out->str);
+ g_value_take_string (value, out->str);
g_string_free (out, FALSE);
} else {
g_value_set_string (value, NULL);
@@ -627,7 +627,7 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp
text[n] = '\0';
xmlFree (xmlbuf);
- g_value_set_string_take_ownership (value, text);
+ g_value_take_string (value, text);
break; }
default:
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 50969d7078..889f068eeb 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -769,7 +769,7 @@ impl_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps
break;
case PROP_TEXT:
- g_value_set_string_take_ownership (value, e_search_bar_get_text (esb));
+ g_value_take_string (value, e_search_bar_get_text (esb));
break;
default:
diff --git a/widgets/misc/gal-combo-box.c b/widgets/misc/gal-combo-box.c
index 46e42ec788..49fddfb92f 100644
--- a/widgets/misc/gal-combo-box.c
+++ b/widgets/misc/gal-combo-box.c
@@ -610,7 +610,7 @@ gtk_combo_tearoff_bg_copy (GalComboBox *combo)
gdk_draw_drawable (GDK_DRAWABLE (pixmap), gc,
widget->window,
0, 0, 0, 0, -1, -1);
- gdk_gc_unref (gc);
+ g_object_unref (gc);
gtk_widget_set_usize (combo->priv->tearoff_window,
widget->allocation.width,