Update to GTK 3

src/sbbs3/gtkmonitor/GNUmakefile

@@ -23,10 +23,10 @@ endif
 
 vpath %.c ..
 
-CFLAGS	+=	$(SBBSDEFS) -I.. -I../../comio $(SMBLIB_CFLAGS) $(HASH_CFLAGS) $(XPDEV-MT_CFLAGS) $(JS_CFLAGS) $(CRYPT_CFLAGS) `pkg-config libglade-2.0 --cflags`
+CFLAGS	+=	$(SBBSDEFS) -I.. -I../../comio $(SMBLIB_CFLAGS) $(HASH_CFLAGS) $(XPDEV-MT_CFLAGS) $(JS_CFLAGS) $(CRYPT_CFLAGS) `pkg-config gtk+-3.0 --cflags`
 # Hopefully, -Wl,-E exports all symbols dynamically everywhere.
 LDFLAGS	+=	-Wl,-E -L../$(LIBODIR) $(SMBLIB_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS)
-EXTRA_LIBS +=	`pkg-config libglade-2.0 --libs`
+EXTRA_LIBS +=	`pkg-config gtk+-3.0 --libs`
 
 # Because pkg-config for libglade uses --rpath, we need to also, LD_RUN_PATH
 # won't work.  :-(

src/sbbs3/gtkmonitor/events.c

@@ -705,8 +705,8 @@ char *select_filename(GtkWidget *wiggy, char *title, char *name, char *in_patter
 	chooser=gtk_file_chooser_dialog_new(title
 			,GTK_WINDOW(gtk_widget_get_toplevel(wiggy))
 			,GTK_FILE_CHOOSER_ACTION_OPEN
-			,GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL
-			,GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT
+			,"_Cancel", GTK_RESPONSE_CANCEL
+			,"_Open", GTK_RESPONSE_ACCEPT
 			,NULL);
 	gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(chooser), TRUE);
 	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser) ,dir);

src/sbbs3/gtkmonitor/util_funcs.c

@@ -257,7 +257,7 @@ void display_message(char *title, char *message, char *icon)
 	dialog=gtk_dialog_new_with_buttons(title
 			,GTK_WINDOW(GTK_WIDGET(gtk_builder_get_object (builder, "MainWindow")))
 			,GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT
-			,GTK_STOCK_OK
+			,"_OK"
 			,GTK_RESPONSE_NONE
 			,NULL);
 	if(icon==NULL)
@@ -269,7 +269,7 @@ void display_message(char *title, char *message, char *icon)
 			,"response"
 			,G_CALLBACK(gtk_widget_destroy)
             ,dialog);
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
+	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)),
 			label);
 	gtk_widget_show_all (dialog);
 	gtk_dialog_run(GTK_DIALOG(dialog));