[anjuta/git-shell: 5/5] Merge branch 'master' into git-shell

[James Liggett <jrliggett src gnome org>]

commit da67cdabc0f871f5f13f12e810dca4608d7434d3
Merge: f0856c7 84877d8
Author: James Liggett <jrliggett cox net>
Date:   Sun Jul 11 14:34:36 2010 -0700

    Merge branch 'master' into git-shell
    
    Conflicts:
    	libanjuta/Makefile.am
    	libanjuta/anjuta-glade-catalog.c
    	libanjuta/anjuta-glade.xml

 libanjuta/Makefile.am                 |   30 ++-
 libanjuta/anjuta-glade-catalog.c      |    2 +
 libanjuta/anjuta-glade.xml            |    6 +
 libanjuta/anjuta-pkg-config-chooser.c |  444 +++++++++++++++++++++++++++++++++
 libanjuta/anjuta-pkg-config-chooser.h |   67 +++++
 plugins/gbf-am/gbf-am-dialogs.ui      |  216 ++++++++--------
 plugins/gbf-am/gbf-am-properties.c    |   93 +-------
 7 files changed, 661 insertions(+), 197 deletions(-)
---
diff --cc libanjuta/Makefile.am
index 96ac07a,1af0abb..3bfe31a
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@@ -75,20 -93,12 +93,23 @@@ libanjuta_la_SOURCES= 
  	anjuta-command-queue.h \
  	anjuta-project.c \
  	anjuta-project.h \
 +	anjuta-drop-entry.c \
 +	anjuta-drop-entry.h \
  	anjuta-tabber.c \
  	anjuta-tabber.h \
 +	anjuta-command-bar.c \
 +	anjuta-command-bar.h \
 +	anjuta-dock.c \
 +	anjuta-dock.h \
 +	anjuta-dock-pane.c \
 +	anjuta-dock-pane.h \
 +	anjuta-file-list.c \
- 	anjuta-file-list.h
++	anjuta-file-list.h \
+ 	anjuta-pkg-config-chooser.h \
+ 	anjuta-pkg-config-chooser.c
+ 
  
 +
  if HAVE_PLUGIN_GLADE
  
  # For now install in our own prefix
@@@ -147,12 -157,8 +168,14 @@@ libanjuta_include = 
  	gbf-project.h \
  	anjuta-project.h \
  	anjuta-command-queue.h \
 +	anjuta-drop-entry.h \
 +	anjuta-tabber.h \
 +	anjuta-command-bar.h \
 +	anjuta-dock.h \
 +	anjuta-dock-pane.h \
- 	anjuta-file-list.h
++	anjuta-file-list.h \
+ 	anjuta-tabber.h \
+ 	anjuta-pkg-config-chooser.h
  
  libanjutainclude_HEADERS = \
  	$(libanjuta_include) \
diff --cc libanjuta/anjuta-glade-catalog.c
index facc522,5f79f9d..37a4845
--- a/libanjuta/anjuta-glade-catalog.c
+++ b/libanjuta/anjuta-glade-catalog.c
@@@ -1,4 -1,3 +1,6 @@@
  /* Stub file for Anjuta Glade 3 Plugin */
  #include <libanjuta/anjuta-vcs-status-tree-view.h>
 -#include <libanjuta/anjuta-pkg-config-chooser.h>
 +#include <libanjuta/anjuta-drop-entry.h>
 +#include <libanjuta/anjuta-file-list.h>
++#include <libanjuta/anjuta-pkg-config-chooser.h>
++
diff --cc libanjuta/anjuta-glade.xml
index a37daf7,a83a678..8ebaa21
--- a/libanjuta/anjuta-glade.xml
+++ b/libanjuta/anjuta-glade.xml
@@@ -25,17 -25,13 +25,23 @@@
  				</property>
  			</properties>
  		</glade-widget-class>
 +
 +		<glade-widget-class name="AnjutaDropEntry" title="Drop Entry"
 +		 generic-name="dropentry" />
 +
 +		 <glade-widget-class name="AnjutaFileList" title="File List"
 +		 generic-name="filelist1" />
++		 
+ 				<glade-widget-class name="AnjutaPkgConfigChooser" title="pkg-config chooser" 
+ 		 generic-name="pkg_config_chooser">
+ 		</glade-widget-class>
++
  	</glade-widget-classes>
  
  	<glade-widget-group name="Anjuta" title="Anjuta">
  		<glade-widget-class-ref name="AnjutaVcsStatusTreeView" />
 +		<glade-widget-class-ref name="AnjutaDropEntry" />
 +		<glade-widget-class-ref name="AnjutaFileList" />
+ 		<glade-widget-class-ref name="AnjutaPkgConfigChooser" />
  	</glade-widget-group>
  </glade-catalog>