From ae0903ea87393a8952bfbf7f0df46ce1912f4fd2 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Sat, 10 Mar 2012 11:38:27 +0000
Subject: [PATCH] Corrigindo apresentação dos menus popup.

---
 src/gtk/common/config.c       |  2 +-
 src/gtk/uiparser/menuitem.c   |  2 +-
 src/gtk/uiparser/private.h    |  2 +-
 src/gtk/uiparser/uiparser.cbp | 15 ++++++++-------
 ui/default.xml                |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/gtk/common/config.c b/src/gtk/common/config.c
index 0111d8f..a4ae1d1 100644
--- a/src/gtk/common/config.c
+++ b/src/gtk/common/config.c
@@ -355,7 +355,7 @@ void set_boolean_to_config(const gchar *group, const gchar *key, gboolean val)
  	DWORD	disp;
 	gchar * path = g_strdup_printf("%s\\%s",registry_path,group);
 
-	trace("Creating key %s",path);
+//	trace("Creating key %s",path);
 	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
 	{
 		DWORD	value = val ? 1 : 0;
diff --git a/src/gtk/uiparser/menuitem.c b/src/gtk/uiparser/menuitem.c
index adf0123..b839af4 100644
--- a/src/gtk/uiparser/menuitem.c
+++ b/src/gtk/uiparser/menuitem.c
@@ -89,7 +89,7 @@
 
 	gtk_menu_shell_append((GtkMenuShell *) menu, widget);
 
-	return G_OBJECT(ui_insert_element(info, action, UI_ELEMENT_MENUITEM, names, values, G_OBJECT(widget), error));
+	return G_OBJECT(widget);
  }
 
  void ui_end_menuitem(GObject *widget,struct parser *info,GError **error)
diff --git a/src/gtk/uiparser/private.h b/src/gtk/uiparser/private.h
index 452a9fb..cb4a7f5 100644
--- a/src/gtk/uiparser/private.h
+++ b/src/gtk/uiparser/private.h
@@ -38,7 +38,6 @@
  {
  	UI_ELEMENT_MENUBAR,
  	UI_ELEMENT_MENU,
- 	UI_ELEMENT_MENUITEM,
  	UI_ELEMENT_TOOLBAR,
  	UI_ELEMENT_TOOLITEM,
  	UI_ELEMENT_POPUP,
@@ -49,6 +48,7 @@
  #define UI_ELEMENT_SEPARATOR	UI_ELEMENT_COUNT+1
  #define UI_ELEMENT_ACCELERATOR UI_ELEMENT_COUNT+2
  #define UI_ELEMENT_SCRIPT		UI_ELEMENT_COUNT+3
+ #define UI_ELEMENT_MENUITEM	UI_ELEMENT_COUNT+4
 
  struct parser
  {
diff --git a/src/gtk/uiparser/uiparser.cbp b/src/gtk/uiparser/uiparser.cbp
index 5288f37..0647694 100644
--- a/src/gtk/uiparser/uiparser.cbp
+++ b/src/gtk/uiparser/uiparser.cbp
@@ -7,8 +7,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin/Debug/uiparser" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Debug/" />
+				<Option output=".bin\Debug\uiparser" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj\Debug\" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -17,8 +17,8 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output=".bin/Release/uiparser" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Release/" />
+				<Option output=".bin\Release\uiparser" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj\Release\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -32,13 +32,13 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="`pkg-config gtk+-2.0 --cflags`" />
-			<Add directory="../../include" />
+			<Add directory="..\..\include" />
 		</Compiler>
 		<Linker>
 			<Add option="`pkg-config gtk+-2.0 --libs`" />
 		</Linker>
-		<Unit filename="../common/common.h.in" />
-		<Unit filename="../common/config.c">
+		<Unit filename="..\common\common.h.in" />
+		<Unit filename="..\common\config.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="accelerator.c">
@@ -83,6 +83,7 @@
 		<Unit filename="toolitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\..\ui\default.xml" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/ui/default.xml b/ui/default.xml
index 0d3a62c..0751d88 100644
--- a/ui/default.xml
+++ b/ui/default.xml
@@ -155,7 +155,7 @@
 		<menuitem action='Quit'/>
 	</popup>
 
-	<popup name='defaultpopup' type="default">
+	<popup name='defaultpopup' type='default'>
 		<menuitem action='Paste'/>
 		<menuitem action='PasteNext'/>
 		<menuitem action='SelectAll'/>
--
libgit2 0.21.2