summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Walter <stefw@src.gnome.org>2007-07-27 16:45:59 +0000
committerStefan Walter <stefw@src.gnome.org>2007-07-27 16:45:59 +0000
commita02eb79957ce7a3254ddf35776b88704ff03bdb7 (patch)
tree58a495f62c12c5d7dad809900333dd28e77a7670
parent6ea94638df76a23588bc91f1aed59120b7e40322 (diff)
downloadgnome-keyring-a02eb79957ce7a3254ddf35776b88704ff03bdb7.tar.gz
Fix compiler warnings
* common/gkr-location.c: * ui/gkr-ask-tool-widgets.c: Fix compiler warnings svn path=/trunk/; revision=727
-rw-r--r--ChangeLog7
-rw-r--r--common/gkr-location.c2
-rw-r--r--ui/gkr-ask-tool-widgets.c2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 43d0eb3c..96df26f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-07-27 Stef Walter <stef@memberwebs.com>
+ * common/gkr-location.c:
+ * ui/gkr-ask-tool-widgets.c: Fix compiler warnings
+
+2007-07-27 Stef Walter <stef@memberwebs.com>
+
* ui/gkr-ask-tool.c: Grab the keyboard properly when prompting
for a password. Fixes bug #349729
@@ -240,7 +245,7 @@
* configure.in: Bump version number
-=== gnome-keyring 2.19.4 ===
+=== gnome-keyring 2.19.5 ===
2007-07-06 Stef Walter <stef@memberwebs.com>
diff --git a/common/gkr-location.c b/common/gkr-location.c
index bb1b7f15..f0c273c1 100644
--- a/common/gkr-location.c
+++ b/common/gkr-location.c
@@ -682,7 +682,7 @@ gkr_location_from_child (GQuark parent, const gchar *child)
/* We don't allow a colon in our paths */
for (c = child; *c; ++c) {
if (*c == ':') {
- g_warning ("path has a colon in it. It cannot be used as a location: %s", path);
+ g_warning ("path has a colon in it. It cannot be used as a location: %s", child);
g_return_val_if_reached (0);
}
}
diff --git a/ui/gkr-ask-tool-widgets.c b/ui/gkr-ask-tool-widgets.c
index 8056504d..f5f1f92d 100644
--- a/ui/gkr-ask-tool-widgets.c
+++ b/ui/gkr-ask-tool-widgets.c
@@ -22,7 +22,7 @@ create_location_label (GKeyFile *input_data)
{
GtkWidget *widget = NULL;
GtkWidget *label, *image;
- const gchar *display;
+ const gchar *display = NULL;
gchar *location = NULL;
gchar **loc_names = NULL;
gsize i, n_loc_names, n_loc_displays;