diff options
| author | Přemysl Janouch <p.janouch@gmail.com> | 2012-04-17 10:29:14 +0200 |
|---|---|---|
| committer | Přemysl Janouch <p.janouch@gmail.com> | 2012-08-11 07:25:54 +0200 |
| commit | b0ecd81212bd26a72d5c10f85c2061a9264ccf81 (patch) | |
| tree | 7cc137fd40f8983f97ce77823d9bf4b7c7812ba2 | |
| parent | 94f27cb38c25287aa554cbd512596930b979e17e (diff) | |
| download | logdiag-b0ecd81212bd26a72d5c10f85c2061a9264ccf81.tar.gz logdiag-b0ecd81212bd26a72d5c10f85c2061a9264ccf81.tar.xz logdiag-b0ecd81212bd26a72d5c10f85c2061a9264ccf81.zip | |
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.
| -rw-r--r-- | liblogdiag/ld-diagram-connection.c | 2 | ||||
| -rw-r--r-- | liblogdiag/ld-diagram-view.c | 3 | ||||
| -rw-r--r-- | liblogdiag/ld-library.c | 7 | ||||
| -rw-r--r-- | src/logdiag.c | 18 |
4 files changed, 12 insertions, 18 deletions
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; } /* diff --git a/src/logdiag.c b/src/logdiag.c index 904514e..fd32e69 100644 --- a/src/logdiag.c +++ b/src/logdiag.c @@ -106,6 +106,15 @@ main (int argc, char *argv[]) bind_textdomain_codeset (GETTEXT_DOMAIN, "UTF-8"); textdomain (GETTEXT_DOMAIN); +#ifdef PROJECT_GSETTINGS_DIR + /* This is enabled when the build is set up for developing, so that the + * application can find its schema. It might also find use when + * installing the application into a location that's missing from + * g_get_system_data_dirs(), for example /usr/local or ~/.local. + */ + g_setenv ("GSETTINGS_SCHEMA_DIR", PROJECT_GSETTINGS_DIR, 0); +#endif /* PROJECT_GSETTINGS_DIR */ + #ifdef _WIN32 /* Don't be unneccessarily limited by the system ANSI codepage. */ argv_overriden = get_utf8_args (&argc, &argv); @@ -131,15 +140,6 @@ main (int argc, char *argv[]) } #endif -#ifdef PROJECT_GSETTINGS_DIR - /* This is enabled when the build is set up for developing, so the - * application can find it's schema. It might also find use when - * installing the application into a location that's missing from - * g_get_system_data_dirs(), for example /usr/local or ~/.local. - */ - g_setenv ("GSETTINGS_SCHEMA_DIR", PROJECT_GSETTINGS_DIR, 0); -#endif /* PROJECT_GSETTINGS_DIR */ - gtk_window_set_default_icon_name (PROJECT_NAME); /* TODO: Be able to open multiple files. */ |