X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbuilder-menus.c;h=dbc7bcb3229b7799d5b9b2a6e30227277ed9692f;hb=7c2a752b3724ad9ac88b7abfecc63e4e0eb7eb54;hp=5a32a4186c0dd4ec8ff45663d3f7bc947cd784a3;hpb=eed307713b8ef4da5e4edf0aa8d85aa5c32a6d4f;p=~andy%2Fgtk

diff --git a/gtk/gtkbuilder-menus.c b/gtk/gtkbuilder-menus.c
index 5a32a4186..dbc7bcb32 100644
--- a/gtk/gtkbuilder-menus.c
+++ b/gtk/gtkbuilder-menus.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
@@ -106,8 +104,12 @@ gtk_builder_menu_start_element (GMarkupParseContext  *context,
         {
           GMenuItem *item;
 
-          item = g_menu_item_new (NULL, NULL);
-          gtk_builder_menu_push_frame (state, NULL, item);
+          if (COLLECT (G_MARKUP_COLLECT_INVALID, NULL))
+            {
+              item = g_menu_item_new (NULL, NULL);
+              gtk_builder_menu_push_frame (state, NULL, item);
+            }
+
           return;
         }
 
@@ -243,7 +245,7 @@ gtk_builder_menu_end_element (GMarkupParseContext  *context,
       state->string = NULL;
 
       /* do the translation if necessary */
-      if (state->translatable && state->parser_data->domain)
+      if (state->translatable)
         {
           const gchar *translated;