gtk3 client library + module now hackishly working

3 files changed, 14 insertions, 13 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 4455221..5a06736 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,8 +5,8 @@ AM_LDFLAGS = $(GTK_LIBS)
 
 client_SOURCES = client.c
 client_CPPFLAGS = $(GTK_CFLAGS)
-client_LDADD = $(GTK_LIBS) ../libtopmenu-client/libtopmenu-client.la
+client_LDADD = $(GTK_LIBS) ../libtopmenu-client/libtopmenu-client-gtk$(GTK_VERSION).la
 
 server_SOURCES = server.c
 server_CPPFLAGS = $(GTK_CFLAGS)
-server_LDADD = $(GTK_LIBS) ../libtopmenu-server/libtopmenu-server.la
+server_LDADD = $(GTK_LIBS) ../libtopmenu-server/libtopmenu-server-gtk$(GTK_VERSION).la
diff --git a/test/client.c b/test/client.c
index 08312e6..8aff036 100644
--- a/test/client.c
+++ b/test/client.c
@@ -19,25 +19,27 @@ static GtkWidget * create_menu_bar(void)
 	GtkLabel *app_label = GTK_LABEL(gtk_bin_get_child(GTK_BIN(app)));
 	gtk_label_set_markup(app_label, "<b>Client</b>");
 
-	gtk_menu_bar_append(bar, GTK_WIDGET(app));
-	gtk_menu_bar_append(bar, GTK_WIDGET(file));
-	gtk_menu_bar_append(bar, GTK_WIDGET(edit));
-	gtk_menu_bar_append(bar, GTK_WIDGET(help));
+	gtk_menu_shell_append(GTK_MENU_SHELL(bar), GTK_WIDGET(app));
+	gtk_menu_shell_append(GTK_MENU_SHELL(bar), GTK_WIDGET(file));
+	gtk_menu_shell_append(GTK_MENU_SHELL(bar), GTK_WIDGET(edit));
+	gtk_menu_shell_append(GTK_MENU_SHELL(bar), GTK_WIDGET(help));
 
 	GtkMenu *app_menu = GTK_MENU(gtk_menu_new());
 	GtkMenuItem *quit = GTK_MENU_ITEM(gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL));
-	gtk_menu_append(app_menu, GTK_WIDGET(quit));
+	gtk_menu_shell_append(GTK_MENU_SHELL(app_menu), GTK_WIDGET(quit));
 	gtk_menu_item_set_submenu(app, GTK_WIDGET(app_menu));
 
 	GtkMenu *file_menu = GTK_MENU(gtk_menu_new());
 	GtkMenuItem *new = GTK_MENU_ITEM(gtk_image_menu_item_new_from_stock(GTK_STOCK_NEW, NULL));
-	gtk_menu_append(file_menu, GTK_WIDGET(new));
+	gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), GTK_WIDGET(new));
 	GtkMenuItem *open = GTK_MENU_ITEM(gtk_image_menu_item_new_from_stock(GTK_STOCK_OPEN, NULL));
-	gtk_menu_append(file_menu, GTK_WIDGET(open));
+	gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), GTK_WIDGET(open));
 	GtkMenuItem *close = GTK_MENU_ITEM(gtk_image_menu_item_new_from_stock(GTK_STOCK_CLOSE, NULL));
-	gtk_menu_append(file_menu, GTK_WIDGET(close));
+	gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), GTK_WIDGET(close));
 	gtk_menu_item_set_submenu(file, GTK_WIDGET(file_menu));
 
+	gtk_widget_show_all(GTK_WIDGET(bar));
+
 	return GTK_WIDGET(bar);
 }
 
@@ -58,18 +60,18 @@ GtkWindow * create_main_window()
 
 int main(int argc, char **argv)
 {
-	gtk_set_locale();
 	gtk_init(&argc, &argv);
 
 	mainwin = create_main_window();
-	topmenu_monitor_get_instance();
 
 	g_signal_connect(mainwin, "destroy", G_CALLBACK(gtk_main_quit), NULL);
 
 	gtk_widget_realize(GTK_WIDGET(mainwin));
 
+#if 0
 	topmenu_client_connect_window_widget(gtk_widget_get_window(GTK_WIDGET(mainwin)),
 	                                     create_menu_bar());
+#endif
 
 	gtk_widget_show_all(GTK_WIDGET(mainwin));
 
diff --git a/test/server.c b/test/server.c
index d0b9135..031ce61 100644
--- a/test/server.c
+++ b/test/server.c
@@ -22,7 +22,6 @@ static void construct_main_window()
 
 int main(int argc, char **argv)
 {
-	gtk_set_locale();
 	gtk_init(&argc, &argv);
 
 	construct_main_window();