Your message dated Tue, 22 May 2007 12:16:29 +0100
with message-id <[EMAIL PROTECTED]>
and subject line [Pkg-xfce-devel] Bug#382902: xfdesktop4: menu editor saves 
file without closing menu tag
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--- Begin Message ---
Package: xfdesktop4
Version: 4.3.90.1-2
Severity: normal

When editing the menu using xfce4-menueditor, if the last item in the menu
is a non-empty menu, then when the file is saved, the closing </menu> tag
is missing from the last menu in the file:

|     <menu name="Debian Menu" icon="/usr/share/pixmaps/debian-logo.png">
|         <include type="file" src="menudefs.hook"/>
| </xfdesktop-menu>

The following patch fixes the problem:

--- xfdesktop4-4.3.90.1.dist/menueditor/utils.c 2006-04-16 15:47:39.000000000 
+0100
+++ xfdesktop4-4.3.90.1/menueditor/utils.c      2006-08-14 03:07:01.000000000 
+0100
@@ -29,6 +29,7 @@
 {
   FILE *file_menu;
   gint last_depth;
+  ENTRY_TYPE last_type;
 };
 
 static gboolean
@@ -138,9 +139,9 @@
     break;
   }
 
-
-
   state->last_depth = gtk_tree_path_get_depth (path);
+  if (gtk_tree_path_get_depth (path) == 1) state->last_type = type;
+
   g_free (space);
   g_free (name);
   g_free (command);
@@ -174,6 +175,14 @@
     if (model)
       gtk_tree_model_foreach (model, &save_treeview_foreach_func, &state);
 
+    if (state.last_type == MENU) {
+        /* Add last closing menu tag. */
+        gchar *space2 = NULL;
+        space2 = g_strnfill(1, '\t');
+        fprintf (state.file_menu, "%s</menu>\n", space2);
+        g_free (space2);
+    }
+
     fprintf (file_menu, "</xfdesktop-menu>\n");
     fclose (file_menu);
   }


-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.14.4
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)

Versions of packages xfdesktop4 depends on:
ii  libatk1.0-0               1.12.1-1       The ATK accessibility toolkit
ii  libc6                     2.3.6-15       GNU C Library: Shared libraries
ii  libcairo2                 1.2.0-3        The Cairo 2D vector graphics libra
ii  libexo-0.3-0              0.3.1.6beta1-1 Library with extensions for Xfce
ii  libfontconfig1            2.3.2-7        generic font configuration library
ii  libfreetype6              2.2.1-2        FreeType 2 font engine, shared lib
ii  libglib2.0-0              2.10.3-3       The GLib library of C routines
ii  libgtk2.0-0               2.8.18-1       The GTK+ graphical user interface 
ii  libice6                   1:1.0.0-3      X11 Inter-Client Exchange library
ii  libpango1.0-0             1.12.3-1+b1    Layout and rendering of internatio
ii  libpng12-0                1.2.8rel-5.2   PNG library - runtime
ii  libsm6                    1:1.0.0-4      X11 Session Management library
ii  libthunar-vfs-1-2         0.3.0beta1-3   VFS abstraction used in thunar
ii  libx11-6                  2:1.0.0-7      X11 client-side library
ii  libxcursor1               1.1.5.2-5      X cursor management library
ii  libxext6                  1:1.0.0-4      X11 miscellaneous extension librar
ii  libxfce4mcs-client3       4.3.90.1-1     Client library for Xfce4 configure
ii  libxfce4util2             4.3.90.1-1     Utility functions library for Xfce
ii  libxfcegui4-4             4.3.90.1-1     Basic GUI C functions for Xfce4
ii  libxfixes3                1:3.0.1.2-4    X11 miscellaneous 'fixes' extensio
ii  libxi6                    1:1.0.0-5      X11 Input extension library
ii  libxinerama1              1:1.0.1-4      X11 Xinerama extension library
ii  libxrandr2                2:1.1.0.2-4    X11 RandR extension library
ii  libxrender1               1:0.9.0.2-4    X Rendering Extension client libra
ii  procps                    1:3.2.7-2      /proc file system utilities
ii  xfce4-mcs-manager         4.3.90.1-3     Settings manager for Xfce4
ii  xfce4-panel               4.3.90.1-3     The Xfce4 desktop environment pane
ii  xfce4-utils               4.3.90.1-1     Various tools for Xfce
ii  zlib1g                    1:1.2.3-13     compression library - runtime

xfdesktop4 recommends no packages.

-- no debconf information


--- End Message ---
--- Begin Message ---
Version: 4.4.1-1

On Mon, Aug 14, 2006 at 03:48:34AM +0100, David Riley wrote:
> When editing the menu using xfce4-menueditor, if the last item in the menu
> is a non-empty menu, then when the file is saved, the closing </menu> tag
> is missing from the last menu in the file:

I'm not sure when this was fixed but this is no longer the case in
4.4.1.  Thanks for the report and apologies for the lack of a prompter
response.

Simon.

-- 
Just another wannabie |  "Ahh.. Very passable, this,   |  Just another fool
----------------------+ very passable." - Monty Python +-------------------
This message was brought to you by the letter A and the number 38.
htag.pl 0.0.22 -- http://www.earth.li/projectpurple/progs/htag.html

--- End Message ---
_______________________________________________
Pkg-xfce-devel mailing list
Pkg-xfce-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-xfce-devel

Reply via email to