From: havner <havner@pld-linux.org>
Date: Mon, 26 Jul 2004 21:23:37 +0000 (+0000)
Subject: - fixed for 2.8
X-Git-Tag: auto/ac/aumix-2_8-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Faumix-gtk.git;a=commitdiff_plain;h=0e61d16c6de870317674eb1a9e70a6bcaf534a09

- fixed for 2.8

Changed files:
    aumix-home_etc.patch -> 1.9
---

diff --git a/aumix-home_etc.patch b/aumix-home_etc.patch
index cb8386a..99e45a2 100644
--- a/aumix-home_etc.patch
+++ b/aumix-home_etc.patch
@@ -115,12 +115,12 @@ diff -Nru aumix-2.6.1/po/gl.po aumix-2.6.1.new/po/gl.po
  "  h:  this helpful message\n"
  msgstr ""
  "  d:  axustar outro dispositivo que non sexa /dev/mixer\n"
- "  f:  especificar ficheiro para gardar e cargar parámetros (por omisión é\n"
+ "  f:  especificar ficheiro para gardar e cargar opcións (por omisión é\n"
 -"      ~/.aumixrc ou /etc/aumixrc)\n"
 +"      $CONFIG_DIR/aumixrc ou /etc/aumixrc)\n"
  "  h:  amosar esta mensaxe de axuda\n"
  
- #: src/common.c:689
+ #: src/common.c:707
 diff -Nru aumix-2.6.1/po/pl.po aumix-2.6.1.new/po/pl.po
 --- aumix-2.6.1/po/pl.po	Tue Jun 27 23:11:47 2000
 +++ aumix-2.6.1.new/po/pl.po	Tue Jun 27 23:16:16 2000
@@ -150,13 +150,13 @@ diff -Nru aumix-2.6.1/po/pt_BR.po aumix-2.6.1.new/po/pt_BR.po
 +"      $CONFIG_DIR/aumixrc or /etc/aumixrc)\n"
  "  h:  this helpful message\n"
  msgstr ""
- "  d:  usar outro dispositivo que não o /dev/mixer\n"
- "  f:  SPECIFY FILE FOR SAVING AND LOADING SETTINGS (DEFAULTS TO\n"
--"      ~/.aumixrc or /etc/aumixrc)\n"
+ "  d:  ajusta um dispositivo em /dev/mixer\n"
+ "  f:  especifica um arquivo para ler e gravar as configurações (o padrão é   "
+-"    ~/.aumixrc or /etc/aumixrc)\n"
 +"      $CONFIG_DIR/aumixrc or /etc/aumixrc)\n"
- "  h:  esta mensagem de ajuda\n"
+ "  h:  essa mensagem de ajuda\n"
  
- #: src/common.c:689
+ #: src/common.c:707
 diff -Nru aumix-2.6.1/po/ru.po aumix-2.6.1.new/po/ru.po
 --- aumix-2.6.1/po/ru.po	Tue Jun 27 23:11:47 2000
 +++ aumix-2.6.1.new/po/ru.po	Tue Jun 27 23:16:07 2000
@@ -187,12 +187,12 @@ diff -Nru aumix-2.6.1/po/uk.po aumix-2.6.1.new/po/uk.po
  "  h:  this helpful message\n"
  msgstr ""
  "  d:  ÒÅÇÕÌÀ×ÁÔÉ ÐÒÉÓÔÒϧ ÏËÒ¦Í /dev/mixer\n"
- "  f:  ×ËÁÚÁÎÎÑ ¦ÍÅΦ ÆÁÊÌÕ ÄÌÑ ÚÂÅÒ¦ÇÁÎÎÑ Ò¦×Î¦× (ÚÁ ÚÁÍÏ×ÞÁÎÎÑÍ\n"
+ "  f:  ×ËÁÚÁÔÉ ¦Í'Ñ ÆÁÊÌÕ ÄÌÑ ÚÂÅÒÅÖÅÎÎÑ Ò¦×Î¦× (ÚÁ ÚÁÍÏ×ÞÁÎÎÑÍ\n"
 -"      ~/.aumixrc ÞÉ /etc/aumixrc)\n"
 +"      $CONFIG_DIR/aumixrc ÞÉ /etc/aumixrc)\n"
  "  h:  ÃÑ ÄÏÐÏÍÏÇÁ\n"
  
- #: src/common.c:689
+ #: src/common.c:707
 diff -Nru aumix-2.6.1/src/Makefile.am aumix-2.6.1.new/src/Makefile.am
 --- aumix-2.6.1/src/Makefile.am	Tue Jun 27 23:11:47 2000
 +++ aumix-2.6.1.new/src/Makefile.am	Wed Jun 28 00:12:13 2000
@@ -243,12 +243,12 @@ diff -Nru aumix-2.6.1/src/common.c aumix-2.6.1.new/src/common.c
 @@ -571,6 +573,8 @@
  	FILE           *setfile;
  	char           *home;
- 	char            filename[FILENAME_MAX];
+ 	char            filename[PATH_MAX];
 +	struct cfv	etcfile;
 +
  	if (save_filename == NULL) {
  		home = getenv("HOME");
- 		if ((strlen(home) + strlen(AUMIXRC)) < PATH_MAX) {
+ 		if ((strlen(home) + strlen(AUMIXRC) + 2) < PATH_MAX) {
 @@ -585,6 +589,19 @@
  		}
  		if (setfile == NULL) {
@@ -268,7 +268,7 @@ diff -Nru aumix-2.6.1/src/common.c aumix-2.6.1.new/src/common.c
 +			setfile = fopen(filename, mode);
  		}
  	} else
- 		setfile = fopen(save_filename, mode);
+ 		setfile = CheckAndOpen(save_filename, mode);
 diff -Nru aumix-2.6.1/src/userdir.c aumix-2.6.1.new/src/userdir.c
 --- aumix-2.6.1/src/userdir.c	Thu Jan  1 01:00:00 1970
 +++ aumix-2.6.1.new/src/userdir.c	Tue Jun 27 23:11:28 2000