[Pkg-electronics-commits] [SCM] Packaging for Pcb branch, master, updated. debian/20110918-1-3-g70f6879

[أحمد المحمو =?UTF-8?Q?=D8=AF=D9=8A=20?=(Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 7408d4f0b88143006f4659688f1a72e75bb01f2c
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Wed Sep 21 16:53:19 2011 +0200

    Added default_GtkFileChooser_cwd.diff patch to default the GTK file
    chooser dialogs to cwd
    
    Closes: #642060

diff --git a/debian/patches/default_GtkFileChooser_cwd.diff b/debian/patches/default_GtkFileChooser_cwd.diff
new file mode 100644
index 0000000..fb02177
--- /dev/null
+++ b/debian/patches/default_GtkFileChooser_cwd.diff
@@ -0,0 +1,55 @@
+Description: Set default path in GTK file choosers to cwd
+Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
+Bug: https://bugs.launchpad.net/pcb/+bug/855621
+Bug-Debian: http://bugs.debian.org/642060
+Forwarded: https://bugs.launchpad.net/pcb/+bug/855621/+attachment/2436146/+files/default_GtkFileChooser_cwd.diff
+
+--- a/src/hid/gtk/gtkhid-main.c
++++ b/src/hid/gtk/gtkhid-main.c
+@@ -11,6 +11,7 @@
+ #endif
+ #include <math.h>
+ #include <time.h>
++#include <unistd.h>
+ 
+ 
+ #include "action.h"
+@@ -1230,6 +1231,13 @@
+   static gchar *current_layout_dir = NULL;
+   static gchar *current_netlist_dir = NULL;
+ 
++  if(!current_element_dir)
++    current_element_dir = get_current_dir_name();
++  if(!current_layout_dir)
++    current_layout_dir = get_current_dir_name();
++  if(!current_netlist_dir)
++    current_netlist_dir = get_current_dir_name();
++
+   /* we've been given the file name */
+   if (argc > 1)
+     return hid_actionv ("LoadFrom", argc, argv);
+@@ -1303,6 +1311,9 @@
+ 
+   static gchar *current_dir = NULL;
+ 
++  if(!current_dir)
++    current_dir = get_current_dir_name();
++
+   if (argc > 1)
+     return hid_actionv ("SaveTo", argc, argv);
+ 
+@@ -1986,6 +1997,9 @@
+     static int I_am_recursing = 0; 
+     int rv;
+ 
++    if(!current_layout_dir)
++      current_layout_dir = get_current_dir_name();
++
+     if (I_am_recursing)
+ 	return 1;
+ 
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -1 +1,2 @@
+ .pc/fix_pan_action.diff/src/hid/gtk/gtkhid-main.c
++.pc/default_GtkFileChooser_cwd.diff/src/hid/gtk/gtkhid-main.c
diff --git a/debian/patches/series b/debian/patches/series
index c4441cd..8496baa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_typo.diff
 outdated_config.diff
 fix_pan_action.diff
 pcbtest_paths.diff
+default_GtkFileChooser_cwd.diff

-- 
Packaging for Pcb