GNOME.org
 

gtranslator r3470 - in branches/GOBJECT_WORK: . src

Author: icq
Date: Thu Jan 31 21:19:58 2008
New Revision: 3470
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3470&view=rev

Log:
2008-01-31  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * src:
                * actions-help: 
                        Changed copyright date.
                * window.c:
                * tab.c:
                        Added some comments.
        * configure.ac:
                Changed vesion to 1.9.3.



Modified:
   branches/GOBJECT_WORK/ChangeLog
   branches/GOBJECT_WORK/configure.ac
   branches/GOBJECT_WORK/install-sh
   branches/GOBJECT_WORK/src/actions-help.c
   branches/GOBJECT_WORK/src/tab.c
   branches/GOBJECT_WORK/src/window.c

Modified: branches/GOBJECT_WORK/configure.ac
==============================================================================
--- branches/GOBJECT_WORK/configure.ac	(original)
+++ branches/GOBJECT_WORK/configure.ac	Thu Jan 31 21:19:58 2008
@@ -4,7 +4,7 @@
 dnl (C) 2000-2004 Fatih Demir <kabalak kabalak net>
 dnl -------------------------------------------------------------------
 AC_PREREQ(2.52)
-AC_INIT(gtranslator, 1.9.2,
+AC_INIT(gtranslator, 1.9.3,
 	http://bugzilla.gnome.org/enter_bug.cgi?product=gtranslator)
 
 AC_CONFIG_SRCDIR(src/main.c)

Modified: branches/GOBJECT_WORK/install-sh
==============================================================================
--- branches/GOBJECT_WORK/install-sh	(original)
+++ branches/GOBJECT_WORK/install-sh	Thu Jan 31 21:19:58 2008
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-10-14.15
+scriptversion=2006-12-25.00
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
 if test -z "$doit"; then
   doit_exec=exec
 else
@@ -58,34 +58,49 @@
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
 
-posix_glob=
 posix_mkdir=
 
 # Desired mode of installed file.
 mode=0755
 
+chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
-chgrpcmd=
-stripcmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
 while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
+    -c) ;;
+
+    -C) copy_on_change=true;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-        shift
-        shift
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
-        continue;;
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	shift;;
+
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
@@ -165,21 +170,22 @@
 
     *)  break;;
   esac
+  shift
 done
 
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
   # Otherwise, the last argument is the destination.  Remove it from $  
   for arg
   do
-    if test -n "$dstarg"; then
+    if test -n "$dst_arg"; then
       # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dstarg"
+      set fnord "$@" "$dst_arg"
       shift # fnord
     fi
     shift # arg
-    dstarg=$arg
+    dst_arg=$arg
   done
 fi
 
@@ -224,7 +230,7 @@
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
       dstdir=$dst
@@ -378,26 +384,19 @@
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix=/ ;;
-	-*) prefix=./ ;;
-	*)  prefix= ;;
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
       esac
 
-      case $posix_glob in
-        '')
-	  if (set -f) 2>/dev/null; then
-	    posix_glob=true
-	  else
-	    posix_glob=false
-	  fi ;;
-      esac
+      eval "$initialize_posix_glob"
 
       oIFS=$IFS
       IFS=/
-      $posix_glob && set -f
+      $posix_glob set -f
       set fnord $dstdir
       shift
-      $posix_glob && set +f
+      $posix_glob set +f
       IFS=$oIFS
 
       prefixes=
@@ -459,41 +458,54 @@
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dst"; then
-	       $doit $rmcmd -f "$dst" 2>/dev/null \
-	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-	       || {
-		 echo "$0: cannot unlink or rename $dst" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dst"
-	 }
-    } || exit 1
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
 
     trap '' 0
   fi

Modified: branches/GOBJECT_WORK/src/actions-help.c
==============================================================================
--- branches/GOBJECT_WORK/src/actions-help.c	(original)
+++ branches/GOBJECT_WORK/src/actions-help.c	Thu Jan 31 21:19:58 2008
@@ -2,7 +2,7 @@
  * (C) 2000-2007 	Fatih Demir <kabalak kabalak net>
  *			Gediminas Paulauskas <menesis kabalak net>
  *			Roy-Magne Mo <rmo sunnmore net>
- *			Ignacio Casal <nacho resa gmail com>
+ *			Ignacio Casal Quinteiro <nacho resa gmail com>
  * 
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -86,7 +86,7 @@
 	gtk_show_about_dialog (GTK_WINDOW (window),
 		"comments", _("Translation file editing suite for localization of applications and libraries."),
 		"authors", authors,
-		"copyright", _("Copyright  1999-2007 Free Software Foundation, Inc."),
+		"copyright", _("Copyright  1999-2008 Free Software Foundation, Inc."),
 		"documenters", documenters,
 		"license", license_trans,
 		"logo-icon-name", "gtranslator",

Modified: branches/GOBJECT_WORK/src/tab.c
==============================================================================
--- branches/GOBJECT_WORK/src/tab.c	(original)
+++ branches/GOBJECT_WORK/src/tab.c	Thu Jan 31 21:19:58 2008
@@ -31,7 +31,6 @@
 #include "message-table.h"
 #include "msg.h"
 #include "tab.h"
-#include "panel.h"
 #include "po.h"
 #include "prefs-manager.h"
 #include "view.h"
@@ -629,12 +628,25 @@
 	return tab->priv->po;
 }
 
+/**
+ * gtranslator_tab_get_state:
+ * @tab: a #GtranslatorTab
+ *
+ * Return value: the #GtranslatorTabState value of the @tab.
+ */
 GtranslatorTabState
 gtranslator_tab_get_state(GtranslatorTab *tab)
 {
 	return tab->priv->state;
 }
 
+/**
+ * gtranslator_tab_set_state:
+ * @tab: a #GtranslatorTab
+ * @state: a #GtranslatorTabState
+ *
+ * Sets the state for a #GtranslatorTab
+ */
 void
 gtranslator_tab_set_state(GtranslatorTab *tab,
 			  GtranslatorTabState state)
@@ -686,7 +698,7 @@
  * gtranslator_tab_get_comment_panel:
  * @tab: a #GtranslatorTab
  *
- * Return value: the comment panel
+ * Return value: the #GtranslaorCommentPanel
  */
 GtranslatorCommentPanel *
 gtranslator_tab_get_comment_panel(GtranslatorTab *tab)
@@ -749,6 +761,12 @@
 	return ret;
 }
 
+/**
+ * gtranslator_tab_get_name:
+ * @tab: a #GtranslatorTab 
+ * 
+ * Return value: a new allocated string with the name of the @tab.
+ */
 gchar *
 gtranslator_tab_get_name(GtranslatorTab *tab)
 {
@@ -773,6 +791,9 @@
  * gtranslator_tab_message_go_to:
  * @tab: a #GtranslatorTab
  * @to_go: the #GtranslatorMsg you want to jump
+ *
+ * Jumps to the specific @to_go pointer message and show the message
+ * in the #GtranslatorView.
 **/
 void 
 gtranslator_tab_message_go_to(GtranslatorTab *tab,

Modified: branches/GOBJECT_WORK/src/window.c
==============================================================================
--- branches/GOBJECT_WORK/src/window.c	(original)
+++ branches/GOBJECT_WORK/src/window.c	Thu Jan 31 21:19:58 2008
@@ -26,7 +26,6 @@
 #include "msg.h"
 #include "notebook.h"
 #include "tab.h"
-#include "panel.h"
 #include "plugins-engine.h"
 #include "po.h"
 #include "statusbar.h"
@@ -1569,13 +1568,6 @@
 	return GTR_NOTEBOOK(window->priv->notebook);
 }
 
-
-GtranslatorPanel *
-gtranslator_window_get_side_panel(GtranslatorWindow *window)
-{
-	return GTR_PANEL(window->priv->sidebar);
-}
-
 GtkStatusbar *
 gtranslator_window_get_statusbar(GtranslatorWindow *window)
 {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]