2007-11-19 [wwp] 3.1.0cvs1

	* src/edittags.c
		Fix a tiny leak and duplicate variable.

diff --git a/ChangeLog b/ChangeLog
index 140a9b8faeae58447d902caa4db942874d2c2b35..e97e3ac8b7ca76cfe919c08c3b863a2cf6ea2f75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-19 [wwp]       3.1.0cvs1
+
+       * src/edittags.c
+               Fix a tiny leak and duplicate variable.
+
 2007-11-19 [paul]      3.1.0
 
        * NEWS

diff --git a/PATCHSETS b/PATCHSETS
index 49d230404acad2e6697c73061d060769da0f44c3..d3e3e2f7ed2a507442f5d5ee97eaf2ff71161e20 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3058,3 +3058,4 @@
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/edittags.c;  ) > 3.0.2cvs143.patchset
 ( cvs diff -u -r 1.60.2.46 -r 1.60.2.47 po/es.po;  ) > 3.0.2cvs144.patchset
 ( cvs diff -u -r 1.58.2.33 -r 1.58.2.34 po/de.po;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 po/fi.po;  cvs diff -u -r 1.42.2.33 -r 1.42.2.34 po/fr.po;  cvs diff -u -r 1.5.2.7 -r 1.5.2.8 po/hu.po;  cvs diff -u -r 1.34.2.23 -r 1.34.2.24 po/it.po;  cvs diff -u -r 1.10.2.14 -r 1.10.2.15 po/pl.po;  cvs diff -u -r 1.50.2.27 -r 1.50.2.28 po/pt_BR.po;  cvs diff -u -r 1.2.2.26 -r 1.2.2.27 po/sk.po;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 po/zh_CN.po;  ) > 3.0.2cvs145.patchset
+( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/edittags.c;  ) > 3.1.0cvs1.patchset

diff --git a/configure.ac b/configure.ac
index d5ffc6f8f474b02d60b045e816c7ff7bbca24f10..8b85061e9cb61bdfb4f21487396391295f2f3c52 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/edittags.c b/src/edittags.c
index 5be74ef286ea295fe193af9f3ad3afd025ede7b1..905403610a44556fd3d636988a9db00ea954cc48 100644 (file)
--- a/src/edittags.c
+++ b/src/edittags.c
@@ -76,7 +76,6 @@ static void apply_window_create(void);
 static struct TagApplyWindow
 {
        GtkWidget *window;
-       GtkWidget *list_view;
        GtkWidget *hbox1;
        GtkWidget *vbox1;
        GtkWidget *label;
@@ -103,12 +102,12 @@ void tag_apply_open(GSList *msglist)
        apply_window_load_tags();
 
        if (msglist && !applywindow.has_tag_col) {
-               apply_window_insert_check_column(applywindow.list_view);
+               apply_window_insert_check_column(applywindow.taglist);
                applywindow.has_tag_col = TRUE;
        }
        if (!msglist && applywindow.has_tag_col) {
-               gtk_tree_view_remove_column(GTK_TREE_VIEW(applywindow.list_view),
-                       gtk_tree_view_get_column(GTK_TREE_VIEW(applywindow.list_view), 0));
+               gtk_tree_view_remove_column(GTK_TREE_VIEW(applywindow.taglist),
+                       gtk_tree_view_get_column(GTK_TREE_VIEW(applywindow.taglist), 0));
                applywindow.has_tag_col = FALSE;
        } 
 
@@ -375,10 +374,10 @@ static void apply_window_add_tag(void)
                        apply_window_list_view_insert_tag(applywindow.taglist, &fis.iter, id);
                        gtk_tree_path_free(path);
                }
-               g_free(new_tag);
        } else {
                alertpanel_error(_("Tag is not set."));
        }
+       g_free(new_tag);
 }
 
 static void apply_window_add_tag_cb(GtkWidget *widget,
@@ -502,7 +501,6 @@ static void apply_window_create(void)
        gtk_container_add(GTK_CONTAINER (window), vbox1);
 
        applywindow.window = window;
-       applywindow.list_view = taglist;
        applywindow.hbox1 = hbox1;
        applywindow.vbox1 = vbox1;
        applywindow.label = label;