[seahorse-plugins] Build and repo fixes.

[Stefan Walter <stefw src gnome org>]

commit 9a669ad5d32133831faea06f3aee5a7682435125
Author: Stefan Walter <stef ws local>
Date:   Tue Jul 27 12:56:39 2010 +0200

    Build and repo fixes.
    
     * Fix support for large files by including config.h everywhere properly.
     * Add proper .gitignore

 .gitignore                                  |   66 +++++++++++++++++++++++++++
 agent/seahorse-agent-actions.c              |    2 +
 agent/seahorse-agent-prompt.c               |    2 +
 libseahorse/seahorse-algo.c                 |    2 +
 libseahorse/seahorse-check-button-control.c |    2 +
 libseahorse/seahorse-gconf.c                |    2 +
 libseahorse/seahorse-gpgmex-op.c            |    2 +
 libseahorse/seahorse-gpgmex-util.c          |    3 +-
 libseahorse/seahorse-gtkstock.c             |    2 +
 libseahorse/seahorse-operation.c            |    4 +-
 libseahorse/seahorse-progress.c             |    2 +
 libseahorse/seahorse-unix-signal.c          |    2 +
 libseahorse/seahorse-vfs-data.c             |    2 +
 13 files changed, 90 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 606c912..d4b4aa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 *.o
 *.lo
 *.loT
@@ -27,10 +28,41 @@
 /install-sh
 /intltool-*
 /junk
+=======
+*.a
+*.o
+*.gmo
+*.la
+*.lo
+*.mo
+
+Makefile.in
+Makefile
+.deps
+.libs
+
+/aclocal.m4
+/autom4te.cache
+/config.h
+/config.h.in
+/config.guess
+/config.log
+/config.status
+/config.sub
+/configure
+/depcomp
+/gnome-doc-utils.make
+/intltool-extract.in
+/intltool-merge.in
+/intltool-update.in
+/install-sh
+/INSTALL
+>>>>>>> Build and repo fixes.
 /libtool
 /ltmain.sh
 /missing
 /mkinstalldirs
+<<<<<<< HEAD
 /seahorse-?.?.?
 /seahorse.spec
 /seahorse.p*
@@ -45,3 +77,37 @@
 /*.tasks
 /*.pws
 /*.prj
+=======
+/m4/*.m4
+/stamp*
+
+/agent/seahorse-agent
+/data/seahorse-plugins.schemas
+
+/libseahorse/seahorse-marshal.?
+
+/help/*/seahorse-plugins.xml
+/help/seahorse-plugins-*.omf
+/plugins/applet/GNOME_SeahorseApplet.server
+/plugins/applet/GNOME_SeahorseApplet.server.in
+/plugins/applet/docs/*/seahorse-applet.xml
+/plugins/applet/docs/seahorse-applet-*.omf
+/plugins/applet/seahorse-applet
+/plugins/gedit/seahorse-gedit.schemas
+/plugins/gedit/seahorse-pgp.gedit-plugin
+/plugins/nautilus/seahorse-pgp-encrypted.desktop
+/plugins/nautilus/seahorse-pgp-encrypted.desktop.in
+/plugins/nautilus/seahorse-pgp-keys.desktop
+/plugins/nautilus/seahorse-pgp-keys.desktop.in
+/plugins/nautilus/seahorse-pgp-preferences.desktop
+/plugins/nautilus/seahorse-pgp-signature.desktop
+/plugins/nautilus/seahorse-pgp-signature.desktop.in
+/plugins/nautilus/seahorse-preferences
+/plugins/nautilus/seahorse-tool
+
+/po/Makefile.in.in
+/po/POTFILES
+/po/stamp-it
+/po/.intltool-merge-cache
+
+>>>>>>> Build and repo fixes.
diff --git a/agent/seahorse-agent-actions.c b/agent/seahorse-agent-actions.c
index 582a6e4..44ea82f 100644
--- a/agent/seahorse-agent-actions.c
+++ b/agent/seahorse-agent-actions.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/agent/seahorse-agent-prompt.c b/agent/seahorse-agent-prompt.c
index 83b2696..273e1a9 100644
--- a/agent/seahorse-agent-prompt.c
+++ b/agent/seahorse-agent-prompt.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 /* 
  * Much of the code is originally from pinentry-gtk2:
  * (C) by Albrecht DreÃ? 2004 unter the terms of the GNU Lesser General
diff --git a/libseahorse/seahorse-algo.c b/libseahorse/seahorse-algo.c
index ac5e19c..cba062d 100644
--- a/libseahorse/seahorse-algo.c
+++ b/libseahorse/seahorse-algo.c
@@ -4,6 +4,8 @@
  * time as we can depend on them either in GTK or OS
  */
 
+#include "config.h"
+
 #include "seahorse-algo.h"
 
 /*
diff --git a/libseahorse/seahorse-check-button-control.c b/libseahorse/seahorse-check-button-control.c
index c7cfe23..79d9ce1 100644
--- a/libseahorse/seahorse-check-button-control.c
+++ b/libseahorse/seahorse-check-button-control.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include "seahorse-check-button-control.h"
 #include "seahorse-gconf.h"
 
diff --git a/libseahorse/seahorse-gconf.c b/libseahorse/seahorse-gconf.c
index 416ff7b..fdf51ab 100644
--- a/libseahorse/seahorse-gconf.c
+++ b/libseahorse/seahorse-gconf.c
@@ -18,6 +18,8 @@
  * 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+#include "config.h"
  
 #include <stdlib.h>
  
diff --git a/libseahorse/seahorse-gpgmex-op.c b/libseahorse/seahorse-gpgmex-op.c
index 9e6bbce..cb81467 100644
--- a/libseahorse/seahorse-gpgmex-op.c
+++ b/libseahorse/seahorse-gpgmex-op.c
@@ -18,6 +18,8 @@
  * 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+#include "config.h"
  
 #include "config.h"
 
diff --git a/libseahorse/seahorse-gpgmex-util.c b/libseahorse/seahorse-gpgmex-util.c
index fdbd468..bb30b9f 100644
--- a/libseahorse/seahorse-gpgmex-util.c
+++ b/libseahorse/seahorse-gpgmex-util.c
@@ -19,12 +19,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <errno.h>
 
-#include "config.h"
 #include "seahorse-gpgmex.h"
 #include <glib.h>
 
diff --git a/libseahorse/seahorse-gtkstock.c b/libseahorse/seahorse-gtkstock.c
index ea0a1d1..2be8313 100644
--- a/libseahorse/seahorse-gtkstock.c
+++ b/libseahorse/seahorse-gtkstock.c
@@ -25,6 +25,8 @@
  *
  */
 
+#include "config.h"
+
 #include <gtk/gtk.h>
  
 #include "seahorse-gtkstock.h"
diff --git a/libseahorse/seahorse-operation.c b/libseahorse/seahorse-operation.c
index e77688f..c30ab7a 100644
--- a/libseahorse/seahorse-operation.c
+++ b/libseahorse/seahorse-operation.c
@@ -18,10 +18,10 @@
  * 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
-#include <gtk/gtk.h>
 
 #include "config.h"
+ 
+#include <gtk/gtk.h>
 
 #include "seahorse-util.h"
 #include "seahorse-marshal.h"
diff --git a/libseahorse/seahorse-progress.c b/libseahorse/seahorse-progress.c
index 684a316..b04c43f 100644
--- a/libseahorse/seahorse-progress.c
+++ b/libseahorse/seahorse-progress.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include "seahorse-progress.h"
 #include "seahorse-widget.h"
 
diff --git a/libseahorse/seahorse-unix-signal.c b/libseahorse/seahorse-unix-signal.c
index c925afe..8137e64 100644
--- a/libseahorse/seahorse-unix-signal.c
+++ b/libseahorse/seahorse-unix-signal.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/signal.h>
 
diff --git a/libseahorse/seahorse-vfs-data.c b/libseahorse/seahorse-vfs-data.c
index 6b082f3..2aa3cbc 100644
--- a/libseahorse/seahorse-vfs-data.c
+++ b/libseahorse/seahorse-vfs-data.c
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <stdlib.h>
 #include <fcntl.h>