gnome-control-center r8783 - in trunk: . capplets/default-applications

[jensg svn gnome org]

Author: jensg
Date: Tue Jul 15 22:03:57 2008
New Revision: 8783
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8783&view=rev

Log:
2008-07-15  Jens Granseuer  <jensgr gmx net>

	* configure.in: add
	capplets/default-applications/gnome-default-applications.pc to
	generated files

2008-07-15  Jens Granseuer  <jensgr gmx net>

	* Makefile.am: install the default apps list in the default-apps
	subdirectory
	* gnome-da-xml.c: (gnome_da_xml_load_list): load everything from there
	* gnome-default-applications.pc.in: add file so that applications can
	query where to put their extensions


Added:
   trunk/capplets/default-applications/gnome-default-applications.pc.in
Modified:
   trunk/ChangeLog
   trunk/capplets/default-applications/   (props changed)
   trunk/capplets/default-applications/ChangeLog
   trunk/capplets/default-applications/Makefile.am
   trunk/capplets/default-applications/gnome-da-xml.c
   trunk/configure.in

Modified: trunk/capplets/default-applications/Makefile.am
==============================================================================
--- trunk/capplets/default-applications/Makefile.am	(original)
+++ trunk/capplets/default-applications/Makefile.am	Tue Jul 15 22:03:57 2008
@@ -26,12 +26,15 @@
 Desktop_in_files = default-applications.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
+pkgconfigdir = $(datadir)/pkgconfig
+pkgconfig_DATA = gnome-default-applications.pc
+
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = gnome-at-session.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
 xmldata_in_files = gnome-default-applications.xml.in
-xmldatadir = $(pkgdatadir)
+xmldatadir = $(pkgdatadir)/default-apps
 xmldata_DATA = $(xmldata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
@@ -40,8 +43,7 @@
 	$(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS)	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
 	-DGNOMECC_GLADE_DIR=\""$(gladedir)"\"	\
-	-DGNOMECC_DATA_DIR=\""$(pkgdatadir)"\"
-
+	-DGNOMECC_APPS_DIR=\""$(xmldatadir)"\"
 
 icons16dir = $(datadir)/icons/hicolor/16x16/apps
 dist_icons16_DATA = icons/16x16/gnome-settings-default-applications.png
@@ -68,4 +70,4 @@
 
 
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA) $(autostart_DATA) $(bin_SCRIPTS)
-EXTRA_DIST = $(xmldata_in_files)
+EXTRA_DIST = $(xmldata_in_files) gnome-default-applications.pc.in

Modified: trunk/capplets/default-applications/gnome-da-xml.c
==============================================================================
--- trunk/capplets/default-applications/gnome-da-xml.c	(original)
+++ trunk/capplets/default-applications/gnome-da-xml.c	Tue Jul 15 22:03:57 2008
@@ -283,29 +283,14 @@
 void
 gnome_da_xml_load_list (GnomeDACapplet *capplet)
 {
-    gchar *filename;
-    gchar *dirname;
-    const gchar *extra_file;
-    GDir *app_dir;
-
-    filename = g_build_filename (GNOMECC_DATA_DIR,
-				 "gnome-default-applications.xml",
-				 NULL);
-
-    if (g_file_test (filename, G_FILE_TEST_EXISTS))
-        gnome_da_xml_load_xml (capplet, filename);
-
-    g_free (filename);
-
-    if (capplet->web_browsers == NULL)
-	gnome_da_xml_load_xml (capplet, "./gnome-default-applications.xml");
-
-    dirname = g_build_filename (GNOMECC_DATA_DIR, "default-apps", NULL);
-    app_dir = g_dir_open (dirname, 0, NULL);
+    GDir *app_dir = g_dir_open (GNOMECC_APPS_DIR, 0, NULL);
 
     if (app_dir != NULL) {
+        const gchar *extra_file;
+        gchar *filename;
+
         while ((extra_file = g_dir_read_name (app_dir)) != NULL) {
-            filename = g_build_filename (dirname, extra_file, NULL);
+            filename = g_build_filename (GNOMECC_APPS_DIR, extra_file, NULL);
 
             if (g_str_has_suffix (filename, ".xml"))
                 gnome_da_xml_load_xml (capplet, filename);
@@ -314,7 +299,6 @@
         }
         g_dir_close (app_dir);
     }
-    g_free (dirname);
 }
 
 void

Added: trunk/capplets/default-applications/gnome-default-applications.pc.in
==============================================================================
--- (empty file)
+++ trunk/capplets/default-applications/gnome-default-applications.pc.in	Tue Jul 15 22:03:57 2008
@@ -0,0 +1,10 @@
+prefix= prefix@
+datarootdir= datarootdir@
+datadir= datadir@
+pkgdatadir=${datadir}/@PACKAGE@
+defappsdir=${pkgdatadir}/default-apps
+
+Name: gnome-default-applications
+Description: Default GNOME applications configuration
+Version: @VERSION@
+

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jul 15 22:03:57 2008
@@ -410,6 +410,7 @@
 capplets/default-applications/default-applications.desktop.in
 capplets/default-applications/gnome-at-commandline.in
 capplets/default-applications/gnome-at-session.desktop.in
+capplets/default-applications/gnome-default-applications.pc
 capplets/display/Makefile
 capplets/display/display-properties.desktop.in
 capplets/keybindings/Makefile