1999-04-29 Federico Mena Quintero <federico@nuclecu.unam.mx>

* chmod.c (chmod_cmd): Missing _ in _().
	(chmod_cmd): Added braces around nested if/else.

	* widget.c (is_in_input_map): Added braces around nested if/else.
	(listbox_remove_current): Likewise.

	* subshell.c (read_subshell_prompt): Likewise.

	* view.c (view_status): Likewise.

1999-04-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* gdialogs.c (file_progress_show_count): Use correct formats for
	snprintf().

gnome/ChangeLog

@@ -1,3 +1,8 @@
+1999-04-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gdialogs.c (file_progress_show_count): Use correct formats for
+	snprintf().
+
 1999-05-03  Tuomas Kuosmanen  <tigert@gimp.org>
 
 	* i-directory.png

gnome/gdialogs.c

@@ -254,7 +254,7 @@ file_progress_show (FileOpContext *ctx, long done, long total)
 FileProgressStatus
 file_progress_show_count (FileOpContext *ctx, long done, long total)
 {
-        static gchar count[14]; /* that's a lot of files... */
+        static gchar count[100];
         FileOpContextUI *ui;
 
         g_return_val_if_fail (ctx != NULL, FILE_CONT);
@@ -268,7 +268,7 @@ file_progress_show_count (FileOpContext *ctx, long done, long total)
         if (ui->aborting)
                 return FILE_ABORT;
 
-        snprintf (count, 13, "%d/%d ", done, total);
+        snprintf (count, 100, "%ld/%ld ", done, total);
         gtk_label_set_text (GTK_LABEL (ui->count_label), count);
         while (gtk_events_pending ())
                 gtk_main_iteration ();

src/ChangeLog

@@ -1,3 +1,15 @@
+1999-04-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* chmod.c (chmod_cmd): Missing _ in _().
+	(chmod_cmd): Added braces around nested if/else.
+
+	* widget.c (is_in_input_map): Added braces around nested if/else.
+	(listbox_remove_current): Likewise.
+
+	* subshell.c (read_subshell_prompt): Likewise.
+
+	* view.c (view_status): Likewise.
+
 Tue Apr 27 20:31:13 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* util.c (strip_home_and_password): Don't split the path in the
@@ -48,7 +60,6 @@ Wed Apr 21 20:19:45 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* main.c (main): call (init|done)_textmode_x11_support
 
->>>>>>> 1.297
 Sat Apr 17 13:04:19 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* view.c (do_view_init): Enable viewing of files with negative

src/chmod.c

@@ -322,7 +322,7 @@ void chmod_cmd (void)
 	    return;
 	} else if (vfs_current_is_tarfs ()) {
 	    message (1, _(" Oops... "),
-		     (" I can't run the Chmod command on a tarfs "));
+		     _(" I can't run the Chmod command on a tarfs "));
 	    return;
 	}
     }
@@ -382,11 +382,12 @@ void chmod_cmd (void)
 	    and_mask = ~and_mask;
 
 	    for (i = 0; i < PERMISSIONS; i++) {
-		if (check_perm[i].selected || ch_dlg->ret_value == B_ALL)
+		if (check_perm[i].selected || ch_dlg->ret_value == B_ALL) {
 		    if (check_perm[i].check->state & C_BOOL)
 			or_mask |= check_perm[i].mode;
 		    else
 			and_mask &= ~check_perm[i].mode;
+		}
 	    }
 
 	    apply_mask (&sf_stat);

src/subshell.c

@@ -632,15 +632,15 @@ int read_subshell_prompt (int how)
     {
 	/* {{{ Check for `select' errors */
 
-	if (rc == -1)
+	if (rc == -1) {
 	    if (errno == EINTR)
 		continue;
-	    else
-	    {
+	    else {
 		tcsetattr (STDOUT_FILENO, TCSANOW, &shell_mode);
 		perror ("\n"__FILE__": select (FD_SETSIZE, &tmp...)");
 		exit (1);
 	    }
+	}
 
 	/* }}} */
 

src/view.c

@@ -728,11 +728,18 @@ view_status (WView *view, gboolean update_gui)
 	    if (view->growing_buffer)
 		addstr (_("  [grow]"));
 	}
-        if (w > 26)
+        if (w > 26) {
             if (view->hex_mode)
-                view_percent (view, view->edit_cursor - view->first, view->widget.cols - view->have_frame + 1, update_gui);
+                view_percent (view,
+			      view->edit_cursor - view->first,
+			      view->widget.cols - view->have_frame + 1,
+			      update_gui);
             else
-	        view_percent (view, view->start_display - view->first, view->widget.cols - view->have_frame + 1, update_gui);
+	        view_percent (view,
+			      view->start_display - view->first,
+			      view->widget.cols - view->have_frame + 1,
+			      update_gui);
+	}
     }
     attrset (SELECTED_COLOR);
 }
@@ -2334,8 +2341,6 @@ view_mode_callback (struct Dlg_head *h, int id, int msg)
 void
 view_adjust_size (Dlg_head *h)
 {
-    int cols;
-    
     WView      *view;
     WButtonBar *bar;
 

src/widget.c

@@ -1538,11 +1538,12 @@ is_in_input_map (WInput *in, int c_code)
     int i;
     
     for (i = 0; input_map [i].fn; i++)
-	if (c_code == input_map [i].key_code)
+	if (c_code == input_map [i].key_code) {
 	    if (input_map [i].fn == complete)
 	    	return 2;
 	    else
 	    	return 1;
+	}
     return 0;
 }
 
@@ -1550,10 +1551,10 @@ is_in_input_map (WInput *in, int c_code)
 static void
 port_region_marked_for_delete (WInput *in)
 {
-	if (in->first == 1 && (in->point == in->mark))
-		in->point = strlen (in->buffer);
-	kill_region (in);
-	in->first = 0;
+    if (in->first == 1 && (in->point == in->mark))
+	in->point = strlen (in->buffer);
+    kill_region (in);
+    in->first = 0;
 }
 #else
 static void
@@ -1941,12 +1942,12 @@ listbox_remove_current (WListbox *l, int force)
 #ifdef HAVE_X
     if (l->widget.wdata != (widget_data) NULL) {
         x_listbox_delete_nth (l, l->pos);
-	if (l->count > 1)
+	if (l->count > 1) {
 	    if (l->current->next != l->list)
 		x_listbox_select_nth (l, l->pos);
 	    else if (l->current != l->list)
 		x_listbox_select_nth (l, l->pos - 1);
-	else
+	} else
 	    x_listbox_select_nth (l, 0);
     }
 #endif