Fixed some errors.

git-svn-id: https://subversion.cs.uiuc.edu/svn/bang/eoh2009@85 69d76c3e-0761-0410-948c-9895a8bb34fc
nikron · Jan 31, 2009 · 327a28f · 327a28f
1 parent f2efb19
commit 327a28f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/app/menus.c b/src/app/menus.c
@@ -33,6 +33,8 @@ GtkUIManager* BMACHINE_create_menus(GtkWidget *vbox, GtkWidget *window) {
 	if (err)
 		printf("%s\n",err->message);
 
+	GtkWidget *ssserver = gtk_ui_manager_get_widget(m_manager,"/MainMenu/NetworkMenu/SSServer");
+	BMACHINE_setup_server_menu(ssserver);
 	GtkWidget *menu_bar = gtk_ui_manager_get_widget(m_manager,"/MainMenu");
 	gtk_box_pack_start(GTK_BOX(vbox),menu_bar,FALSE,FALSE,0);
 

diff --git a/src/app/server-menu.c b/src/app/server-menu.c
@@ -43,13 +43,15 @@ static void server_status(int signal, int num_args, void **args) {
 	free(args);
 }
 
-void BMAHCHINE_change_server_status(GtkWidget *widget) {
-	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);
+void BMAHCHINE_change_server_status() {
+	if (ssserver) {
+		if(BANG_is_server_running()) {
+			BANG_server_stop();
+			gtk_widget_set_sensitive(ssserver,FALSE);
+		} else {
+			BANG_server_start(NULL);
+			gtk_widget_set_sensitive(ssserver,FALSE);
+		}
 	}
 }
 

diff --git a/src/app/statusbar.c b/src/app/statusbar.c
@@ -17,7 +17,7 @@ static void bang_status(int signal, int num_args, void **args);
 static void bang_status(int signal, int num_args, void **args) {
 
 	gdk_threads_enter();
-	if (statusbar == NULL) {
+	if (statusbar == NULL && GTK_IS_STATUSBAR(statusbar)) {
 		gdk_threads_leave();
 		return;
 	}