[maemo-commits] [maemo-commits] r8908 - in projects/haf/trunk/libossomime: . libossomime tests

[From: subversion at stage.maemo.org]

Author: martyn
Date: 2007-01-02 15:34:59 +0200 (Tue, 02 Jan 2007)
New Revision: 8908

Modified:
   projects/haf/trunk/libossomime/ChangeLog
   projects/haf/trunk/libossomime/libossomime/osso-uri.c
   projects/haf/trunk/libossomime/tests/Makefile.am
   projects/haf/trunk/libossomime/tests/test-all.c
Log:
	* libossomime/osso-uri.c: Fixed a problem with
	uri_action_type_to_string() only being used with debugging
	enabled. 

	* tests/Makefile.am: Fix the location of the .la file we use with
	the test cases.

	* tests/test-all.c: Fix the location of the
	osso-update-category-database application we run.


Modified: projects/haf/trunk/libossomime/ChangeLog
===================================================================
--- projects/haf/trunk/libossomime/ChangeLog	2007-01-02 12:27:42 UTC (rev 8907)
+++ projects/haf/trunk/libossomime/ChangeLog	2007-01-02 13:34:59 UTC (rev 8908)
@@ -1,5 +1,17 @@
 2007-01-02  Martyn Russell  <martyn at imendio.com>
 
+	* libossomime/osso-uri.c: Fixed a problem with
+	uri_action_type_to_string() only being used with debugging
+	enabled. 
+	
+	* tests/Makefile.am: Fix the location of the .la file we use with
+	the test cases.
+	
+	* tests/test-all.c: Fix the location of the
+	osso-update-category-database application we run.
+
+2007-01-02  Martyn Russell  <martyn at imendio.com>
+
 	* docs/mime-desktop-file-mapping.txt:
 	* libossomime/Makefile.am:
 	* libossomime/osso-uri.[ch]:

Modified: projects/haf/trunk/libossomime/libossomime/osso-uri.c
===================================================================
--- projects/haf/trunk/libossomime/libossomime/osso-uri.c	2007-01-02 12:27:42 UTC (rev 8907)
+++ projects/haf/trunk/libossomime/libossomime/osso-uri.c	2007-01-02 13:34:59 UTC (rev 8908)
@@ -63,8 +63,8 @@
 #define APP_LAUNCH_BANNER_METHOD            "app_launch_banner"
 
 
-/* #define DEBUG_MSG(x)   */
-#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
+#define DEBUG_MSG(x)  
+/*#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");*/
 
 /* The ID is the group name in the desktop file for this
  * action, the domain is the translation domain used for the
@@ -216,19 +216,21 @@
 static OssoURIActionType 
 uri_action_type_from_string (const gchar *type_str)
 {
-	OssoURIActionType type;
+	if (type_str) {
+		const gchar *str;
 
-	type = OSSO_URI_ACTION_NORMAL;
+		str = uri_action_type_to_string (OSSO_URI_ACTION_NEUTRAL);
+		if (g_ascii_strcasecmp (type_str, str) == 0) {
+			return OSSO_URI_ACTION_NEUTRAL;
+		} 
 
-	if (type_str) {
-		if (g_ascii_strcasecmp (type_str, "Neutral") == 0) {
-			type = OSSO_URI_ACTION_NEUTRAL;
-		} else if (g_ascii_strcasecmp (type_str, "Fallback") == 0) {
-			type = OSSO_URI_ACTION_FALLBACK;
+		str = uri_action_type_to_string (OSSO_URI_ACTION_FALLBACK);
+		if (g_ascii_strcasecmp (type_str, str) == 0) {
+			return OSSO_URI_ACTION_FALLBACK;
 		}
 	}
 
-	return type;
+	return OSSO_URI_ACTION_NORMAL;
 }
 
 /*

Modified: projects/haf/trunk/libossomime/tests/Makefile.am
===================================================================
--- projects/haf/trunk/libossomime/tests/Makefile.am	2007-01-02 12:27:42 UTC (rev 8907)
+++ projects/haf/trunk/libossomime/tests/Makefile.am	2007-01-02 13:34:59 UTC (rev 8908)
@@ -20,36 +20,36 @@
 
 test_open_SOURCES = test-open.c
 test_open_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_open_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_open_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_mime_types_SOURCES = test-mime-types.c
 test_mime_types_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_mime_types_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_mime_types_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_mime_icon_SOURCES = test-mime-icon.c
 test_mime_icon_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_mime_icon_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_mime_icon_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_mime_category_SOURCES = test-mime-category.c
 test_mime_category_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_mime_category_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_mime_category_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_mime_default_app_SOURCES = test-mime-default-app.c
 test_mime_default_app_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_mime_default_app_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_mime_default_app_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_uri_SOURCES = test-uri.c
 test_uri_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_uri_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_uri_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_service_SOURCES = test-service.c
 test_service_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_service_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_service_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_mime_patterns_SOURCES = test-mime-patterns.c
 test_mime_patterns_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_mime_patterns_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_mime_patterns_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_all_SOURCES = test-all.c
 test_all_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_all_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_all_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la

Modified: projects/haf/trunk/libossomime/tests/test-all.c
===================================================================
--- projects/haf/trunk/libossomime/tests/test-all.c	2007-01-02 12:27:42 UTC (rev 8907)
+++ projects/haf/trunk/libossomime/tests/test-all.c	2007-01-02 13:34:59 UTC (rev 8908)
@@ -260,12 +260,12 @@
 	g_setenv ("XDG_DATA_DIRS", TEST_DATADIR, TRUE);
 	g_setenv ("XDG_DATA_HOME", TEST_DATADIR "-local", TRUE);
 
-	tmp = g_strdup_printf ("../src/osso-update-category-database %s",
+	tmp = g_strdup_printf ("../libossomime/osso-update-category-database %s",
 			       TEST_DATADIR "/mime");
 	ret = g_spawn_command_line_sync (tmp, NULL, NULL, NULL, &error);
 	g_free (tmp);
 	if (!ret) {
-		g_print ("Couldn't launch ../src/osso-update-category-database: %s\n",
+		g_print ("Couldn't launch ../libossomime/osso-update-category-database: %s\n",
 			 error->message);
 		g_clear_error (&error);
 		return 1;