Add a C version of the glade file and an install target to the CMake file.

src/sbbs3/gtkuseredit/CMakeLists.txt

@@ -8,11 +8,14 @@ find_package(GTK2 2.6 COMPONENTS gtk glade)
 if(GTK2_FOUND)
 	add_executable(gtkuseredit
 		gtkuseredit.c
+		gtkuseredit_glade.c
 		events.c
 	)
-	double_require_libs(gtkuseredit sbbs xpdev smblib)
+	double_require_libs(gtkuseredit sbbs xpdev smblib comio)
 	target_include_directories(gtkuseredit PRIVATE ..)
 	target_link_libraries(gtkuseredit ${GTK2_LIBRARIES})
 	target_include_directories(gtkuseredit PRIVATE ${GTK2_INCLUDE_DIRS})
 	target_compile_definitions(gtkuseredit PRIVATE ${GTK2_DEFINITIONS})
+
+	install(TARGETS gtkuseredit DESTINATION bin)
 endif(GTK2_FOUND)

src/sbbs3/gtkuseredit/gtkuseredit.c

@@ -12,6 +12,7 @@ int			totalusers=0;
 int			current_user=0;
 char		glade_path[MAX_PATH+1];
 GtkBuilder*	builder;
+extern const char builder_interface[];
 
 /* Refreshes global variables... ie: Number of users */
 int refresh_globals(void)
@@ -191,10 +192,7 @@ int main(int argc, char *argv[]) {
 	strcpy(glade_path, argv[0]);
 	strcpy(getfname(glade_path), "gtkuseredit.glade");
 	builder = gtk_builder_new ();
-	if (!gtk_builder_add_from_file (builder, glade_path, &error)) {
-		g_warning ("Couldn't load builder file: %s", error->message);
-		g_error_free (error);
-	}
+	gtk_builder_add_from_string (builder, builder_interface, -1, NULL);
 
     /* connect the signals in the interface */
 	gtk_builder_connect_signals (builder, NULL);

src/sbbs3/gtkuserlist/CMakeLists.txt

@@ -8,12 +8,15 @@ find_package(GTK2 2.6 COMPONENTS gtk glade)
 if(GTK2_FOUND)
 	add_executable(gtkuserlist
 		gtkuserlist.c
+		gtkuserlist_glade.c
 		events.c
 	)
-	double_require_libs(gtkuserlist sbbs xpdev smblib)
+	double_require_libs(gtkuserlist sbbs xpdev smblib comio)
 	target_include_directories(gtkuserlist PRIVATE ..)
 	target_include_directories(gtkuserlist PRIVATE ../../../3rdp/${LEGACY_3RDPDIR}/mozjs/include/js)
 	target_link_libraries(gtkuserlist ${GTK2_LIBRARIES})
 	target_include_directories(gtkuserlist PRIVATE ${GTK2_INCLUDE_DIRS})
 	target_compile_definitions(gtkuserlist PRIVATE ${GTK2_DEFINITIONS})
+
+	install(TARGETS gtkuserlist DESTINATION bin)
 endif(GTK2_FOUND)

src/sbbs3/gtkuserlist/gtkuserlist.c

@@ -7,6 +7,7 @@
 scfg_t		cfg;
 uchar		*arbuf=NULL;
 GtkBuilder*	builder;
+extern const char builder_interface[];
 
 int main(int argc, char **argv)
 {
@@ -16,7 +17,6 @@ int main(int argc, char **argv)
 	char			flags[33];
 	GtkListStore	*lstore = NULL;
 	GtkTreeSelection *lsel;
-	char			glade_path[MAX_PATH+1];
 	char	*p;
 	GtkListStore	*quickstore = NULL;
 	GtkTreeIter		curr;
@@ -46,15 +46,8 @@ int main(int argc, char **argv)
         return(-1);
 	}
 
-    /* load the interface */
-	strcpy(glade_path, argv[0]);
-	strcpy(getfname(glade_path), "gtkuserlist.glade");
-
 	builder = gtk_builder_new ();
-	if (!gtk_builder_add_from_file (builder, glade_path, &error)) {
-		g_warning ("Couldn't load builder file: %s", error->message);
-		g_error_free (error);
-	}
+	gtk_builder_add_from_string(builder, builder_interface, -1, NULL);
 
     /* connect the signals in the interface */
 	gtk_builder_connect_signals (builder, NULL);