Add an icon parameter to display_message() function.

Change a number of error messages to use display_message() rather than
stderr.

src/sbbs3/gtkmonitor/events.c

@@ -301,7 +301,7 @@ void on_truncate_deleted_users1_activate(GtkWidget *wiggy, gpointer data)
         deleted++;
     }
     sprintf(str,"%u Deleted User Records Removed",deleted);
-	display_message("Users Truncated", str);
+	display_message("Users Truncated", str, NULL);
 }
 
 void on_stop6_activate(GtkWidget *wiggy, gpointer data)
@@ -418,12 +418,15 @@ void toggle_node_bits(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
 	char	*node_str;
 	int		n,i;
 	node_t	node;
+	char	str[128];
 
 	gtk_tree_model_get(model, iter, 0, &node_str, -1);
 	n=atoi(node_str);
 
-	if((i=getnodedat(&cfg,n,&node,&fd)))
-		fprintf(stderr,"Error reading node %d data (%d)!",n,i);
+	if((i=getnodedat(&cfg,n,&node,&fd))) {
+		sprintf(str,"Error reading node %d data (%d)!",n,i);
+		display_message("Read Error", str, "gtk-dialog-error");
+	}
 	else {
 		node.misc ^= *bit;
 		putnodedat(&cfg, n, &node, fd);
@@ -477,12 +480,15 @@ void do_clear_errors(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
 	char	*node_str;
 	int		n,i;
 	node_t	node;
+	char	str[128];
 
 	gtk_tree_model_get(model, iter, 0, &node_str, -1);
 	n=atoi(node_str);
 
-	if((i=getnodedat(&cfg,n,&node,&fd)))
-		fprintf(stderr,"Error reading node %d data (%d)!",n,i);
+	if((i=getnodedat(&cfg,n,&node,&fd))) {
+		sprintf(str,"Error reading node %d data (%d)!",n,i);
+		display_message("Read Error",str,"gtk-dialog-error");
+	}
 	else {
 		node.errors = 0;
 		putnodedat(&cfg, n, &node, fd);
@@ -541,8 +547,10 @@ void edituseron_node(GtkWidget *wiggy, gpointer data)
 			,get_lastselected_node
 			,&i);
 
-	if((i=getnodedat(&cfg,i,&node,NULL)))
-		fprintf(stderr,"Error reading node data (%d)!",i);
+	if((i=getnodedat(&cfg,i,&node,NULL))) {
+		sprintf(str,"Error reading node data (%d)!",i);
+		display_message("Read Error",str,"gtk-dialog-error");
+	}
 	else {
 		sprintf(str,"gtkuseredit %d",node.useron);
 		run_external(cfg.exec_dir,str);
@@ -627,7 +635,7 @@ void quick_validate(int usernum, int set)
 	user.number=usernum;
 	if((res=getuserdat(&cfg,&user))) {
 		sprintf(str,"Error loading user %d.\n",usernum);
-		display_message("Load Error",str);
+		display_message("Load Error",str,"gtk-dialog-error");
 		return;
 	}
 	user.flags1=cfg.val_flags1[set];
@@ -645,7 +653,7 @@ void quick_validate(int usernum, int set)
 	user.level=cfg.val_level[set];
 	if((res=putuserdat(&cfg,&user))) {
 		sprintf(str,"Error saving user %d.\n",usernum);
-		display_message("Save Error",str);
+		display_message("Save Error",str,"gtk=dialog-error");
 	}
 }
 
@@ -982,8 +990,10 @@ void quickvalidate_useron_node(GtkWidget *wiggy, gpointer data)
 				,get_lastselected_node
 				,&i);
 
-		if((i=getnodedat(&cfg,i,&node,NULL)))
-			fprintf(stderr,"Error reading node data (%d)!",i);
+		if((i=getnodedat(&cfg,i,&node,NULL))) {
+			sprintf(str,"Error reading node data (%d)!",i);
+			display_message("Read Error",str,"gtk-dialog-error");
+		}
 		else {
 			quick_validate(node.useron, set);
 		}

src/sbbs3/gtkmonitor/gtkmonitor.c

@@ -19,7 +19,7 @@ void refresh_events(void)
     /* Read .cfg files here */
 	free_cfg(&cfg);
     if(!load_cfg(&cfg, NULL, TRUE, str)) {
-		fprintf(stderr,"Cannot load configuration data\n");
+		display_message("Load Error","Cannot load configuration data","gtk-dialog-error");
         return;
 	}
 
@@ -371,13 +371,13 @@ int read_config(void)
 
 	p=getenv("SBBSCTRL");
 	if(p==NULL) {
-		fprintf(stderr,"SBBSCTRL not set\n");
+		display_message("Environment Error","SBBSCTRL not set","gtk-dialog-error");
 		return(-1);
 	}
 	SAFECOPY(ctrl_dir, p);
 	prep_dir("",ctrl_dir,sizeof(ctrl_dir));
 	if(!isdir(ctrl_dir)) {
-		fprintf(stderr,"SBBSCTRL does not point to a directory\n");
+		display_message("Environment Errpr","SBBSCTRL does not point to a directory","gtk-dialog-error");
 		return(-1);
 	}
     memset(&cfg,0,sizeof(cfg));

src/sbbs3/gtkmonitor/util_funcs.c

@@ -50,12 +50,12 @@ void view_text_file(char *path, char *filename)
 	complete_path(p,path,filename);
 	if(!fexist(p)) {
 		sprintf(cmdline,"The file %s does not exist.",p);
-		display_message("File Does Not Exist", cmdline);
+		display_message("File Does Not Exist", cmdline, "gtk-dialog-error");
 	}
 	else {
 		if(access(p,R_OK)) {
 			sprintf(cmdline,"Cannot read the file %s... check your permissions.",p);
-			display_message("Cannot Read File", cmdline);
+			display_message("Cannot Read File", cmdline, "gtk-dialog-error");
 		}
 		else {
 			sprintf(cmdline, "xmessage -file %s", p);
@@ -156,7 +156,7 @@ char *getnumstr(char *outstr, ulong size) {
 	return(outstr);
 }
 
-void display_message(char *title, char *message)
+void display_message(char *title, char *message, char *icon)
 {
 	GtkWidget *dialog, *label;
 
@@ -166,13 +166,16 @@ void display_message(char *title, char *message)
 			,GTK_STOCK_OK
 			,GTK_RESPONSE_NONE
 			,NULL);
+	if(icon==NULL)
+		icon="gtk-info";
+	gtk_window_set_icon_name(GTK_WINDOW(dialog), icon);
 	label = gtk_label_new (message);
 
 	g_signal_connect_swapped (dialog
 			,"response"
 			,G_CALLBACK(gtk_widget_destroy)
             ,dialog);
-   gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
-                      label);
-   gtk_widget_show_all (dialog);
+	gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
+			label);
+	gtk_widget_show_all (dialog);
 }

src/sbbs3/gtkmonitor/util_funcs.h

@@ -11,6 +11,6 @@ void edit_text_file(char *path, char *filename);
 char *getsizestr(char *outstr, long size, BOOL bytes);
 char *getnumstr(char *outstr, ulong size);
 void touch_sem(char *path, char *filename);
-void display_message(char *title, char *message);
+void display_message(char *title, char *message, char *icon);
 
 #endif