From b0ecd81212bd26a72d5c10f85c2061a9264ccf81 Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Tue, 17 Apr 2012 10:29:14 +0200 Subject: Maintenance. * Fix setting the GSETTINGS_SCHEMA_DIR environment variable. * Use g_value_take_boxed() instead of deprecated g_value_set_boxed_take_ownership(). * Remove an unused variable. * Clean up load_category() a bit. --- liblogdiag/ld-diagram-connection.c | 2 +- liblogdiag/ld-diagram-view.c | 3 --- liblogdiag/ld-library.c | 7 ++----- 3 files changed, 3 insertions(+), 9 deletions(-) (limited to 'liblogdiag') diff --git a/liblogdiag/ld-diagram-connection.c b/liblogdiag/ld-diagram-connection.c index a0131f3..52b51bb 100644 --- a/liblogdiag/ld-diagram-connection.c +++ b/liblogdiag/ld-diagram-connection.c @@ -98,7 +98,7 @@ ld_diagram_connection_get_property (GObject *object, guint property_id, case PROP_POINTS: points = ld_diagram_connection_get_points (self); - g_value_set_boxed_take_ownership (value, points); + g_value_take_boxed (value, points); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); diff --git a/liblogdiag/ld-diagram-view.c b/liblogdiag/ld-diagram-view.c index d8b5d0a..012c586 100644 --- a/liblogdiag/ld-diagram-view.c +++ b/liblogdiag/ld-diagram-view.c @@ -2392,11 +2392,8 @@ on_scroll (GtkWidget *widget, GdkEventScroll *event, gpointer user_data) { gdouble prev_x, prev_y; gdouble new_x, new_y; - LdPoint point; LdDiagramView *self; - point.x = event->x; - point.y = event->y; self = LD_DIAGRAM_VIEW (widget); if (self->priv->operation != OPER_0 diff --git a/liblogdiag/ld-library.c b/liblogdiag/ld-library.c index 399d4f2..31c3797 100644 --- a/liblogdiag/ld-library.c +++ b/liblogdiag/ld-library.c @@ -167,7 +167,7 @@ LoadCategoryData; static LdSymbolCategory * load_category (LdLibrary *self, const gchar *path, const gchar *name) { - LdSymbolCategory *cat; + LdSymbolCategory *cat = NULL; gchar *icon_file, *category_file; gchar *human_name; LoadCategoryData data; @@ -200,13 +200,10 @@ load_category (LdLibrary *self, const gchar *path, const gchar *name) g_free (human_name); g_free (category_file); - g_free (icon_file); - return cat; - load_category_fail_2: g_free (icon_file); load_category_fail_1: - return NULL; + return cat; } /* -- cgit v1.2.3-70-g09d2