GNOME.org
 

updated: [7015de5] Merge commit 'origin/236_replace_gboolean'

The following commit has been merged in the master branch:
commit 7015de5db51b00fe6c5ea6c49556ffcb526aca13
Merge: fb745c77ff7636cfb2eedbac929679f06adbf28b 4fcf4e9685d9b2e4b49bfa3f7d3709dbe48073b6
Author: Enrico Weigelt, metux IT service <weigelt metux de>
Date:   Mon Feb 2 21:16:39 2009 +0100

    Merge commit 'origin/236_replace_gboolean'

diff --combined ChangeLog
index f111f15,9e53731..b78cdd6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -3,6 -3,7 +3,7 @@@
  	* src/util.c: fixed name_trunc() on NULL or empty parameters
  	* src/achown.c: fixed unitialized var in init_chown_advanced()
  	  (patch from andrew_b)
+ 	* replaced gboolean by bool (from mhl/types.h)
  
  2009-01-31 Enrico Weigelt, metux ITS <weigelt metux de>, Patrick Winnertz <winnie debian org>, Slava Zanko <slavazanko gmail com>, Sergei Trofimovich  <slyfox inbox ru>
  
@@@ -11,14 -12,15 +12,14 @@@
  	* src/find.c, src/main.c, src/panelize.c, src/util.c, src/utilunix.c,
  	* src/widget.c, src/widget.h, src/wtools.c, vfs/fish.c:
  	  fixed shell escaping issues in commandline completion engine
 -
 -2009-01-31 Enrico Weigelt, metux ITS <weigelt metux de>
 -
  	* replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() (in mhl/string.h)
 +	* replaced g_snprintf() by snprintf()
  
  2009-01-30 Enrico Weigelt, metux ITS <weigelt metux de>
  
  	* src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
  	  (out-of-tree builds)
 +	* syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL syntax (#193)
  
  2009-01-29 Mikhail S. Pobolovets <styx mp gmail com>
  	* lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
@@@ -34,6 -36,9 +35,6 @@@
  
  	* mhl/escape.h, src/complete.c, vfs/fish.c: introduced new type 
  	  SHELL_ESCAPED_STR for more type safety
 -
 -2009-01-27 Enrico Weigelt, metux IT service <weigelt metux de>
 -
  	* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
  
  2009-01-27 Sergei Trofimovich  <slyfox inbox ru>
@@@ -61,7 -66,7 +62,7 @@@
  	* src/cmd.c src/option.c src/setup.c src/main.h: Automatic new directory(Mkdir, F7)
  	  name filling. Can be configured (on|off) in 'Configure options'
  
 -2009-01-25 Enrico Weigelt <weigelt metux de>
 +2009-01-25 Enrico Weigelt, metux ITS <weigelt metux de>
  
  	* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
  	* src/hotlist.c, src/panelize.c, src/tree.c, src/user.c: 
@@@ -70,11 -75,9 +71,11 @@@
  	  translated strings. This breaks now once every history file
  	  but afterwards this will be stable
  
 -2009-01-24 Enrico Weigelt <weigelt metux de>
 +2009-01-24 Enrico Weigelt, metux ITS <weigelt metux de>
  
  	* src/cmd.c: fixed bug #35 (do_view_cmd is now calling repaint_screen())
 +	* syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +	  for Nemerle source files
  
  2009-01-24 Patrick Winnertz <winnie debian org>
  
@@@ -82,6 -85,11 +83,6 @@@
  	  - prevent . to match a newline (\n)
  	  - match from start of line and not from cursor position
  
 -2009-01-24  Enrico Weigelt, metux IT service <weigelt metux de>
 -
 -	* syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 -	  for Nemerle source files
 -
  2009-01-19 Patrick Winnertz <winnie debian org>
  
  	* edit/edit.h: Add two more ints
@@@ -96,7 -104,7 +97,7 @@@
  	* src/main.c: Removed unused function do_mc_filename_rename
  	* src/util.c: Removed unused struct whentm
  
 -2009-01-16 Enrico Weigelt, metux IT service <weigelt metux de>
 +2009-01-16 Enrico Weigelt, metux ITS <weigelt metux de>
  
  	* src/subshell: setting subshell pty to close-on-exec 
  	  (taken from mandriva patches)
@@@ -134,6 -142,9 +135,6 @@@
  	* syntax/Makefile.am syntax/Syntax syntax/haskell.syntax:
  	added syntax definition for Haskell (taken from rhclub-tree)
  	* syntax: added ebuild Syntax defition (taken from rhclub-tree)
 -
 -2009-01-10  Enrico Weigelt, metux ITS <weigelt metux de>
 -
  	* edit/editcmd.c:
  	* src/achown.c src/background.c src/boxes.c src/chmod.c:
  	* src/chown.c src/cmd.c src/command.c src/dir.c src/execute.c:
diff --combined src/file.c
index 5fb0bfd,2ed0465..ffc93dd
--- a/src/file.c
+++ b/src/file.c
@@@ -50,6 -50,7 +50,7 @@@
  #include <sys/stat.h>
  #include <unistd.h>
  
+ #include <mhl/types.h>
  #include <mhl/memory.h>
  #include <mhl/escape.h>
  #include <mhl/string.h>
@@@ -1034,7 -1035,7 +1035,7 @@@ move_file_file (FileOpContext *ctx, con
  {
      struct stat src_stats, dst_stats;
      int return_status = FILE_CONT;
-     gboolean copy_done = FALSE;
+     bool copy_done = FALSE;
  
      if (file_progress_show_source (ctx, s) == FILE_ABORT
  	|| file_progress_show_target (ctx, d) == FILE_ABORT)
@@@ -1701,10 -1702,10 +1702,10 @@@ panel_operate_generate_prompt (const WP
  
      if (single_source) {
  	i = fmd_xlen - strlen (format_string) - 4;
 -	g_snprintf (cmd_buf, sizeof (cmd_buf), format_string,
 +	snprintf (cmd_buf, sizeof (cmd_buf), format_string,
  		    name_trunc (single_source, i));
      } else {
 -	g_snprintf (cmd_buf, sizeof (cmd_buf), format_string,
 +	snprintf (cmd_buf, sizeof (cmd_buf), format_string,
  		    panel->marked);
  	i = strlen (cmd_buf) + 6 - fmd_xlen;
  	if (i > 0) {
@@@ -2126,7 -2127,7 +2127,7 @@@ real_do_file_error (enum OperationMode 
  int
  file_error (const char *format, const char *file)
  {
 -    g_snprintf (cmd_buf, sizeof (cmd_buf), format,
 +    snprintf (cmd_buf, sizeof (cmd_buf), format,
  		path_trunc (file, 30), unix_error_string (errno));
  
      return do_file_error (cmd_buf);
@@@ -2142,7 -2143,7 +2143,7 @@@ files_error (const char *format, const 
      strcpy (nfile1, path_trunc (file1, 15));
      strcpy (nfile2, path_trunc (file2, 15));
  
 -    g_snprintf (cmd_buf, sizeof (cmd_buf), format, nfile1, nfile2,
 +    snprintf (cmd_buf, sizeof (cmd_buf), format, nfile1, nfile2,
  		unix_error_string (errno));
  
      return do_file_error (cmd_buf);
diff --combined src/find.c
index 8d90bc8,b41b06c..141a4cf
--- a/src/find.c
+++ b/src/find.c
@@@ -27,6 -27,7 +27,7 @@@
  #include <string.h>
  #include <sys/stat.h>
  
+ #include <mhl/types.h>
  #include <mhl/string.h>
  
  #include "global.h"
@@@ -143,7 -144,7 +144,7 @@@ static void get_list_info (char **file
  static regex_t *r; /* Pointer to compiled content_pattern */
   
  static int case_sensitive = 1;
- static gboolean find_regex_flag = TRUE;
+ static bool find_regex_flag = TRUE;
  static int find_recursively = 1;
  
  /*
@@@ -530,7 -531,7 +531,7 @@@ search_content (Dlg_head *h, const cha
      if (file_fd == -1)
  	return 0;
  
 -    g_snprintf (buffer, sizeof (buffer), _("Grepping in %s"), name_trunc (filename, FIND2_X_USE));
 +    snprintf (buffer, sizeof (buffer), _("Grepping in %s"), name_trunc (filename, FIND2_X_USE));
  
      status_update (buffer);
      mc_refresh ();
@@@ -666,7 -667,7 +667,7 @@@ do_search (struct Dlg_head *h
  	    if (verbose){
  		char buffer [BUF_SMALL];
  
 -		g_snprintf (buffer, sizeof (buffer), _("Searching %s"), 
 +		snprintf (buffer, sizeof (buffer), _("Searching %s"), 
  			    name_trunc (directory, FIND2_X_USE));
  		status_update (buffer);
  	    }
diff --combined src/utilunix.c
index 77b07b9,1d4c149..bc558f9
--- a/src/utilunix.c
+++ b/src/utilunix.c
@@@ -41,6 -41,7 +41,7 @@@
  #endif
  #include <unistd.h>
  
+ #include <mhl/types.h>
  #include <mhl/string.h>
  
  #include "global.h"
@@@ -95,7 -96,7 +96,7 @@@ char *get_owner (int uid
  	return pwd->pw_name;
      }
      else {
 -	g_snprintf (ibuf, sizeof (ibuf), "%d", uid);
 +	snprintf (ibuf, sizeof (ibuf), "%d", uid);
  	return ibuf;
      }
  }
@@@ -115,7 -116,7 +116,7 @@@ char *get_group (int gid
  	i_cache_add (gid, gid_cache, GID_CACHE_SIZE, grp->gr_name, &gid_last);
  	return grp->gr_name;
      } else {
 -	g_snprintf (gbuf, sizeof (gbuf), "%d", gid);
 +	snprintf (gbuf, sizeof (gbuf), "%d", gid);
  	return gbuf;
      }
  }
@@@ -256,10 -257,10 +257,10 @@@ mc_tmpdir (void
      pwd = getpwuid (getuid ());
  
      if (pwd)
 -	g_snprintf (buffer, sizeof (buffer), "%s/mc-%s", sys_tmp,
 +	snprintf (buffer, sizeof (buffer), "%s/mc-%s", sys_tmp,
  		pwd->pw_name);
      else
 -	g_snprintf (buffer, sizeof (buffer), "%s/mc-%lu", sys_tmp,
 +	snprintf (buffer, sizeof (buffer), "%s/mc-%lu", sys_tmp,
  		(unsigned long) getuid ());
  
      canonicalize_pathname (buffer);
@@@ -308,11 -309,11 +309,11 @@@
  	if (fallback_ok) {
  	    fprintf (stderr, _("Temporary files will be created in %s\n"),
  		     sys_tmp);
 -	    g_snprintf (buffer, sizeof (buffer), "%s", sys_tmp);
 +	    snprintf (buffer, sizeof (buffer), "%s", sys_tmp);
  	    error = NULL;
  	} else {
  	    fprintf (stderr, _("Temporary files will not be created\n"));
 -	    g_snprintf (buffer, sizeof (buffer), "%s", "/dev/null/");
 +	    snprintf (buffer, sizeof (buffer), "%s", "/dev/null/");
  	}
  
  	fprintf (stderr, "%s\n", _("Press any key to continue..."));
@@@ -721,7 -722,7 +722,7 @@@ mc_realpath (const char *path, char res
  /* Return the index of the permissions triplet */
  int
  get_user_permissions (struct stat *st) {
-     static gboolean initialized = FALSE;
+     static bool initialized = FALSE;
      static gid_t *groups;
      static int ngroups;
      static uid_t uid;
diff --combined src/view.c
index afa9aad,59031f6..f7ebe84
--- a/src/view.c
+++ b/src/view.c
@@@ -39,11 -39,12 +39,12 @@@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
- 
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <unistd.h>
  
+ #include <mhl/types.h>
+ 
  #include "global.h"
  #include "tty.h"
  #include "cmd.h"		/* For view_other_cmd */
@@@ -142,23 -143,23 +143,23 @@@ struct WView 
      size_t ds_string_len;	/* The length of the string */
  
      /* Growing buffers information */
-     gboolean growbuf_in_use;	/* Use the growing buffers? */
+     bool growbuf_in_use;	/* Use the growing buffers? */
      byte   **growbuf_blockptr;	/* Pointer to the block pointers */
      size_t   growbuf_blocks;	/* The number of blocks in *block_ptr */
      size_t   growbuf_lastindex;	/* Number of bytes in the last page of the
  				   growing buffer */
-     gboolean growbuf_finished;	/* TRUE when all data has been read. */
+     bool growbuf_finished;	/* TRUE when all data has been read. */
  
      /* Editor modes */
-     gboolean hex_mode;		/* Hexview or Hexedit */
-     gboolean hexedit_mode;	/* Hexedit */
-     gboolean hexview_in_text;	/* Is the hexview cursor in the text area? */
-     gboolean text_nroff_mode;	/* Nroff-style highlighting */
-     gboolean text_wrap_mode;	/* Wrap text lines to fit them on the screen */
-     gboolean magic_mode;	/* Preprocess the file using external programs */
+     bool hex_mode;		/* Hexview or Hexedit */
+     bool hexedit_mode;	/* Hexedit */
+     bool hexview_in_text;	/* Is the hexview cursor in the text area? */
+     bool text_nroff_mode;	/* Nroff-style highlighting */
+     bool text_wrap_mode;	/* Wrap text lines to fit them on the screen */
+     bool magic_mode;	/* Preprocess the file using external programs */
  
      /* Additional editor state */
-     gboolean hexedit_lownibble;	/* Are we editing the last significant nibble? */
+     bool hexedit_lownibble;	/* Are we editing the last significant nibble? */
      GArray *coord_cache;	/* Cache for mapping offsets to cursor positions */
  
      /* Display information */
@@@ -176,7 -177,7 +177,7 @@@
      struct area data_area;	/* Where the data is displayed */
  
      int dirty;			/* Number of skipped updates */
-     gboolean dpy_bbar_dirty;	/* Does the button bar need to be updated? */
+     bool dpy_bbar_dirty;	/* Does the button bar need to be updated? */
  
      /* Mode variables */
      int bytes_per_line;		/* Number of bytes per line in hex mode */
@@@ -188,7 -189,7 +189,7 @@@
      int  direction;		/* 1= forward; -1 backward */
      void (*last_search)(WView *);
  				/* Pointer to the last search command */
-     gboolean want_to_quit;	/* Prepare for cleanup ... */
+     bool want_to_quit;	/* Prepare for cleanup ... */
  
      /* Markers */
      int marker;			/* mark to use */
@@@ -279,7 -280,7 +280,7 @@@ offset_rounddown (offset_type a, offset
  
  /* {{{ Simple Primitive Functions for WView }}} */
  
- static inline gboolean
+ static inline bool
  view_is_in_panel (WView *view)
  {
      return (view->dpy_frame_size != 0);
@@@ -399,7 -400,7 +400,7 @@@ view_growbuf_read_until (WView *view, o
      ssize_t nread;
      byte *p;
      size_t bytesfree;
-     gboolean short_read;
+     bool short_read;
  
      assert (view->growbuf_in_use);
  
@@@ -514,7 -515,7 +515,7 @@@ view_get_filesize (WView *view
      }
  }
  
- static inline gboolean
+ static inline bool
  view_may_still_grow (WView *view)
  {
      return (view->growbuf_in_use && !view->growbuf_finished);
@@@ -523,7 -524,7 +524,7 @@@
  /* returns TRUE if the idx lies in the half-open interval
   * [offset; offset + size), FALSE otherwise.
   */
- static inline gboolean
+ static inline bool
  already_loaded (offset_type offset, offset_type idx, size_t size)
  {
      return (offset <= idx && idx - offset < size);
@@@ -739,10 -740,10 +740,10 @@@ enum ccache_type 
      CCACHE_LINECOL
  };
  
- static inline gboolean
+ static inline bool
  coord_cache_entry_less (const struct coord_cache_entry *a,
  	const struct coord_cache_entry *b, enum ccache_type crit,
- 	gboolean nroff_mode)
+ 	bool nroff_mode)
  {
      if (crit == CCACHE_OFFSET)
  	return (a->cc_offset < b->cc_offset);
@@@ -828,7 -829,7 +829,7 @@@ view_ccache_dump (WView *view
  }
  #endif
  
- static inline gboolean
+ static inline bool
  is_nroff_sequence (WView *view, offset_type offset)
  {
      int c0, c1, c2;
@@@ -1088,7 -1089,7 +1089,7 @@@ view_scroll_to_cursor (WView *view
  }
  
  static void
- view_movement_fixups (WView *view, gboolean reset_search)
+ view_movement_fixups (WView *view, bool reset_search)
  {
      view_scroll_to_cursor (view);
      if (reset_search) {
@@@ -1454,7 -1455,7 +1455,7 @@@ view_show_error (WView *view, const cha
      }
  }
  
- static gboolean
+ static bool
  view_load_command_output (WView *view, const char *command)
  {
      FILE *fp;
@@@ -1484,7 -1485,7 +1485,7 @@@
      return TRUE;
  }
  
- gboolean
+ bool
  view_load (WView *view, const char *command, const char *file,
  	   int start_line)
  {
@@@ -1492,7 -1493,7 +1493,7 @@@
      int fd = -1;
      char tmp[BUF_MEDIUM];
      struct stat st;
-     gboolean retval = FALSE;
+     bool retval = FALSE;
  
      assert (view->bytes_per_line != 0);
      view_done (view);
@@@ -1516,7 -1517,7 +1517,7 @@@
      } else if (file != NULL && file[0] != '\0') {
  	/* Open the file */
  	if ((fd = mc_open (file, O_RDONLY | O_NONBLOCK)) == -1) {
 -	    g_snprintf (tmp, sizeof (tmp), _(" Cannot open \"%s\"\n %s "),
 +	    snprintf (tmp, sizeof (tmp), _(" Cannot open \"%s\"\n %s "),
  			file, unix_error_string (errno));
  	    view_show_error (view, tmp);
  	    goto finish;
@@@ -1525,7 -1526,7 +1526,7 @@@
  	/* Make sure we are working with a regular file */
  	if (mc_fstat (fd, &st) == -1) {
  	    mc_close (fd);
 -	    g_snprintf (tmp, sizeof (tmp), _(" Cannot stat \"%s\"\n %s "),
 +	    snprintf (tmp, sizeof (tmp), _(" Cannot stat \"%s\"\n %s "),
  			file, unix_error_string (errno));
  	    view_show_error (view, tmp);
  	    goto finish;
@@@ -1741,7 -1742,7 +1742,7 @@@ view_display_ruler (WView *view
  	}
  
  	if ((cl != 0) && (cl % 10) == 0) {
 -	    g_snprintf (r_buff, sizeof (r_buff), "%"OFFSETTYPE_PRId, cl);
 +	    snprintf (r_buff, sizeof (r_buff), "%"OFFSETTYPE_PRId, cl);
  	    if (nums_row < height) {
  		widget_move (view, top + nums_row, left + c - 1);
  		tty_print_string (r_buff);
@@@ -1789,7 -1790,7 +1790,7 @@@ view_display_hex (WView *view
  	col = 0;
  
  	/* Print the hex offset */
 -	g_snprintf (hex_buff, sizeof (hex_buff), "%08"OFFSETTYPE_PRIX" ", from);
 +	snprintf (hex_buff, sizeof (hex_buff), "%08"OFFSETTYPE_PRIX" ", from);
  	widget_move (view, top + row, left);
  	tty_setcolor (MARKED_COLOR);
  	for (i = 0; col < width && hex_buff[i] != '\0'; i++) {
@@@ -2136,7 -2137,7 +2137,7 @@@ view_handle_editkey (WView *view, int k
      return MSG_HANDLED;
  }
  
- static gboolean
+ static bool
  view_hexedit_save_changes (WView *view)
  {
      struct hexedit_change_node *curr, *next;
@@@ -2193,7 -2194,7 +2194,7 @@@
  
  /* {{{ Miscellaneous functions }}} */
  
- static gboolean
+ static bool
  view_ok_to_quit (WView *view)
  {
      int r;
@@@ -2731,7 -2732,7 +2732,7 @@@ view_moveto_line_cmd (WView *view
  
      view_offset_to_coord (view, &line, &col, view->dpy_start);
  
 -    g_snprintf (prompt, sizeof (prompt),
 +    snprintf (prompt, sizeof (prompt),
  		_(" The current line number is %d.\n"
  		  " Enter the new line number:"), (int) (line + 1));
      answer = input_dialog (_(" Goto line "), prompt, MC_HISTORY_VIEW_GOTO_LINE, "");
@@@ -2752,7 -2753,7 +2753,7 @@@ view_moveto_addr_cmd (WView *view
      char *line, *error, prompt[BUF_SMALL];
      offset_type addr;
  
 -    g_snprintf (prompt, sizeof (prompt),
 +    snprintf (prompt, sizeof (prompt),
  		_(" The current address is 0x%lx.\n"
  		  " Enter the new address:"), view->hex_cursor);
      line = input_dialog (_(" Goto Address "), prompt, MC_HISTORY_VIEW_GOTO_ADDR, "");
@@@ -3317,7 -3318,7 +3318,7 @@@ in
  mc_internal_viewer (const char *command, const char *file,
  	int *move_dir_p, int start_line)
  {
-     gboolean succeeded;
+     bool succeeded;
      WView *wview;
      WButtonBar *bar;
      Dlg_head *view_dlg;
diff --combined src/widget.c
index 597438f,9fb0d47..7a3309b
--- a/src/widget.c
+++ b/src/widget.c
@@@ -34,6 -34,7 +34,7 @@@
  #include <string.h>
  #include <sys/types.h>
  
+ #include <mhl/types.h>
  #include <mhl/string.h>
  
  #include "global.h"
@@@ -69,7 -70,7 +70,7 @@@ static int button_event (Gpm_Event *eve
  int quote = 0;
  
  static void
- widget_selectcolor (Widget *w, gboolean focused, gboolean hotkey)
+ widget_selectcolor (Widget *w, bool focused, bool hotkey)
  {
      Dlg_head *h = w->parent;
  
@@@ -157,15 -158,15 +158,15 @@@ button_callback (Widget *w, widget_msg_
  
  	switch (b->flags) {
  	case DEFPUSH_BUTTON:
 -	    g_snprintf (buf, sizeof (buf), "[< %s >]", b->text);
 +	    snprintf (buf, sizeof (buf), "[< %s >]", b->text);
  	    off = 3;
  	    break;
  	case NORMAL_BUTTON:
 -	    g_snprintf (buf, sizeof (buf), "[ %s ]", b->text);
 +	    snprintf (buf, sizeof (buf), "[ %s ]", b->text);
  	    off = 2;
  	    break;
  	case NARROW_BUTTON:
 -	    g_snprintf (buf, sizeof (buf), "[%s]", b->text);
 +	    snprintf (buf, sizeof (buf), "[%s]", b->text);
  	    off = 1;
  	    break;
  	case HIDDEN_BUTTON:
@@@ -358,7 -359,7 +359,7 @@@ radio_callback (Widget *w, widget_msg_
      case WIDGET_DRAW:
  	for (i = 0; i < r->count; i++) {
  	    register const char *cp;
- 	    const gboolean focused = (i == r->pos && msg == WIDGET_FOCUS);
+ 	    const bool focused = (i == r->pos && msg == WIDGET_FOCUS);
  	    widget_selectcolor (w, focused, FALSE);
  	    widget_move (&r->widget, i, 0);
  
@@@ -870,7 -871,7 +871,7 @@@ history_get (const char *input_name
      for (i = 0;; i++) {
  	char key_name[BUF_TINY];
  	char this_entry[BUF_LARGE];
 -	g_snprintf (key_name, sizeof (key_name), "%d", i);
 +	snprintf (key_name, sizeof (key_name), "%d", i);
  	GetPrivateProfileString (input_name, key_name, "", this_entry,
  				 sizeof (this_entry), profile);
  	if (!*this_entry)
@@@ -934,7 -935,7 +935,7 @@@ history_put (const char *input_name, GL
  	/* We shouldn't have null entries, but let's be sure */
  	if (text && *text) {
  	    char key_name[BUF_TINY];
 -	    g_snprintf (key_name, sizeof (key_name), "%d", i++);
 +	    snprintf (key_name, sizeof (key_name), "%d", i++);
  	    WritePrivateProfileString (input_name, key_name, text,
  				       profile);
  	}
@@@ -2282,7 -2283,7 +2283,7 @@@ listbox_get_current (WListbox *l, char 
  }
  
  /* returns TRUE if a function has been called, FALSE otherwise. */
- static gboolean
+ static bool
  buttonbar_call (WButtonBar *bb, int i)
  {
      switch (bb->labels[i].tag) {
@@@ -2441,7 -2442,7 +2442,7 @@@ buttonbar_set_label (Dlg_head *h, int i
  }
  
  void
- buttonbar_set_visible (WButtonBar *bb, gboolean visible)
+ buttonbar_set_visible (WButtonBar *bb, bool visible)
  {
      bb->visible = visible;
  }

-- 
Midnight Commander Development
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]