Split off the server menu into its own file.

git-svn-id: https://subversion.cs.uiuc.edu/svn/bang/eoh2009@72 69d76c3e-0761-0410-948c-9895a8bb34fc

Makefile

@@ -32,11 +32,13 @@ LSRC=src/base/bang-com$(SRCEXT) \
 
 AOBJS=preferences$(OBJEXT) \
       main$(OBJEXT) \
-      statusbar$(OBJEXT)
+      statusbar$(OBJEXT)\
+      server-menu$(OBJEXT)
 
 ASRC=src/app/preferences$(SRCEXT) \
       src/app/main$(SRCEXT) \
-      src/app/statusbar$(SRCEXT)
+      src/app/statusbar$(SRCEXT) \
+      src/app/server-menu$(SRCEXT) \
 
 LIBRARIES=libbang.so $(MODULES)
 MODULES=test-module.so matrix-mult-module.so

src/app/main.c

@@ -43,6 +43,7 @@
 #include"../base/bang.h"
 #include"preferences.h"
 #include"statusbar.h"
+#include"server-menu.h"
 #include<stdio.h>
 #include<stdlib.h>
 #include<glib.h>
@@ -62,14 +63,6 @@ static GtkWidget *file;
 static GtkWidget *filemenu;
 static GtkWidget *open_module;
 
-static GtkWidget *server;
-static GtkWidget *servermenu;
-/**
- * Start Stop Server
- */
-static GtkWidget *ssserver;
-static GtkWidget *server_pref;
-
 static GtkWidget *peers_item;
 static GtkWidget *peersmenu;
 static GtkWidget *connect_peer;
@@ -104,17 +97,6 @@ static void open_bang_module() {
 	gtk_widget_destroy(get_module);
 }
 
-static void change_server_status(GtkWidget *widget) {
-	///Just make the stop button inactive.  We'll make it active when we get the signal.
-	if(BANG_is_server_running()) {
-		BANG_server_stop();
-		gtk_widget_set_sensitive(widget,FALSE);
-	} else {
-		BANG_server_start(NULL);
-		gtk_widget_set_sensitive(widget,FALSE);
-	}
-}
-
 /**
  * GTK callback when the window is about to be deleted, does not to be locked as that comes
  * automagically with all GTK functions.
@@ -182,17 +164,7 @@ int main(int argc, char **argv) {
 	gtk_menu_shell_append(GTK_MENU_SHELL(filemenu),open_module);
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(file),filemenu);
 
-	server = gtk_menu_item_new_with_label("Server");
-	servermenu = gtk_menu_new();
-	ssserver = gtk_image_menu_item_new_from_stock(GTK_STOCK_CONNECT,NULL);
-	gtk_label_set_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN(ssserver))),"Start Server");
-	g_signal_connect(G_OBJECT(ssserver), "activate", G_CALLBACK(change_server_status), NULL);
-
-	server_pref = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES,NULL);
-
-	gtk_menu_shell_append(GTK_MENU_SHELL(servermenu),ssserver);
-	gtk_menu_shell_append(GTK_MENU_SHELL(servermenu),server_pref);
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(server),servermenu);
+	GtkWidget *server_menu = BMACHINE_setup_server_menu();
 
 	peers_item = gtk_menu_item_new_with_label("Peers");
 	peersmenu = gtk_menu_new();
@@ -203,7 +175,7 @@ int main(int argc, char **argv) {
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(peers_item),peersmenu);
 
 	gtk_menu_append(menubar,file);
-	gtk_menu_append(menubar,server);
+	gtk_menu_append(menubar,server_menu);
 	gtk_menu_append(menubar,peers_item);
 
 	/*

src/app/server-menu.c

@@ -0,0 +1,38 @@
+#include<gtk/gtk.h>
+#include"../base/bang.h"
+
+static GtkWidget *server = NULL;
+static GtkWidget *servermenu = NULL;
+/**
+ * Start Stop Server
+ */
+static GtkWidget *ssserver = NULL;
+static GtkWidget *server_pref = NULL;
+
+static void change_server_status() {
+	if(BANG_is_server_running()) {
+		BANG_server_stop();
+		/* gtk_widget_set_sensitive(widget,FALSE); */
+	} else {
+		BANG_server_start(NULL);
+		/* gtk_widget_set_sensitive(widget,FALSE); */
+	}
+}
+
+
+GtkWidget* BMACHINE_setup_server_menu() {
+	server = gtk_menu_item_new_with_label("Server");
+	servermenu = gtk_menu_new();
+
+	ssserver = gtk_image_menu_item_new_from_stock(GTK_STOCK_CONNECT,NULL);
+	gtk_label_set_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN(ssserver))),"Start Server");
+	g_signal_connect(G_OBJECT(ssserver), "activate", G_CALLBACK(change_server_status), NULL);
+
+	server_pref = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES,NULL);
+
+	gtk_menu_shell_append(GTK_MENU_SHELL(servermenu),ssserver);
+	gtk_menu_shell_append(GTK_MENU_SHELL(servermenu),server_pref);
+	gtk_menu_item_set_submenu(GTK_MENU_ITEM(server),servermenu);
+
+	return server;
+}

src/app/server-menu.h

@@ -0,0 +1,6 @@
+#ifndef __SERVER_MENU_H
+#define __SERVER_MENU_H
+#include<gtk/gtk.h>
+
+GtkWidget* BMACHINE_setup_server_menu();
+#endif

src/app/statusbar.c

@@ -3,7 +3,7 @@
 #include"../base/bang.h"
 
 
-static GtkWidget *statusbar;
+static GtkWidget *statusbar = NULL;
 
 static void bang_status(int signal, int num_args, void **args);