[Xfce4-commits] r26254 - squeeze/trunk/libsqueeze

[Stephan Arts]

Author: stephan
Date: 2007-11-04 13:13:51 +0000 (Sun, 04 Nov 2007)
New Revision: 26254

Modified:
   squeeze/trunk/libsqueeze/Makefile.am
   squeeze/trunk/libsqueeze/archive.c
   squeeze/trunk/libsqueeze/archive.h
   squeeze/trunk/libsqueeze/libsqueeze.c
   squeeze/trunk/libsqueeze/support-template.c
   squeeze/trunk/libsqueeze/support-template.h
Log:
Squeeze compiles again!!!



Modified: squeeze/trunk/libsqueeze/Makefile.am
===================================================================
--- squeeze/trunk/libsqueeze/Makefile.am	2007-11-04 12:16:29 UTC (rev 26253)
+++ squeeze/trunk/libsqueeze/Makefile.am	2007-11-04 13:13:51 UTC (rev 26254)
@@ -8,6 +8,10 @@
 	slist.c slist.h \
 	archive-iter-pool.c archive-iter-pool.h \
 	archive-iter.c archive-iter.h \
+	archive-tempfs.c archive-tempfs.h \
+	support-reader.c support-reader.h \
+	support-template.c support-template.h \
+	support-factory.c support-factory.h \
 	archive.c archive.h
 
 # archive-command.c archive-command.h

Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c	2007-11-04 12:16:29 UTC (rev 26253)
+++ squeeze/trunk/libsqueeze/archive.c	2007-11-04 13:13:51 UTC (rev 26254)
@@ -198,7 +198,7 @@
 #ifdef DEBUG
 	g_return_val_if_fail(archive, 0);
 #endif
-	return LSQ_ARCHIVE_PROP_USER;//lsq_builder_settings_get_n_properties(archive->settings) + LSQ_ARCHIVE_PROP_USER;
+	return lsq_support_template_get_n_properties(archive->priv->s_template) + LSQ_ARCHIVE_PROP_USER;
 }
 
 /*
@@ -217,7 +217,7 @@
 			return G_TYPE_STRING;
 			break;
 		default:
-			return G_TYPE_NONE; //lsq_builder_settings_get_property_type(archive->settings, n - LSQ_ARCHIVE_PROP_USER);
+			return lsq_support_template_get_property_type(archive->priv->s_template, n - LSQ_ARCHIVE_PROP_USER);
 			break;
 	}
 }
@@ -239,7 +239,7 @@
 			return _("Mime type");
 			break;
 		default:
-			return NULL; //lsq_builder_settings_get_property_name(archive->settings, n - LSQ_ARCHIVE_PROP_USER);
+			return lsq_support_template_get_property_name(archive->priv->s_template, n - LSQ_ARCHIVE_PROP_USER);
 			break;
 	}
 }
@@ -378,3 +378,12 @@
 {
 	return FALSE;
 }
+
+void
+lsq_archive_set_property_type(LSQArchive *archive, guint n, GType type)
+{
+  if (n >= LSQ_ARCHIVE_PROP_USER)
+  {
+        lsq_support_template_set_property_type(archive->priv->s_template, n, type);
+  }
+}

Modified: squeeze/trunk/libsqueeze/archive.h
===================================================================
--- squeeze/trunk/libsqueeze/archive.h	2007-11-04 12:16:29 UTC (rev 26253)
+++ squeeze/trunk/libsqueeze/archive.h	2007-11-04 13:13:51 UTC (rev 26254)
@@ -103,8 +103,11 @@
 
 gboolean		lsq_archive_operate(LSQArchive *archive, LSQCommandType type);
 
+void
+lsq_archvie_set_property_type(LSQArchive *archive, guint n, GType type);
 
 
+
 G_END_DECLS
 
 #endif /* __ARCHIVE_H__ */

Modified: squeeze/trunk/libsqueeze/libsqueeze.c
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze.c	2007-11-04 12:16:29 UTC (rev 26253)
+++ squeeze/trunk/libsqueeze/libsqueeze.c	2007-11-04 13:13:51 UTC (rev 26254)
@@ -113,7 +113,7 @@
 		return 1;
 	}
 
-	LSQArchive *archive = lsq_opened_archive_get_archive(path);
+	LSQArchive *archive = NULL; /*lsq_opened_archive_get_archive(path); */
 	if(!archive)
 	{
 		archive = lsq_archive_new(path, NULL);

Modified: squeeze/trunk/libsqueeze/support-template.c
===================================================================
--- squeeze/trunk/libsqueeze/support-template.c	2007-11-04 12:16:29 UTC (rev 26253)
+++ squeeze/trunk/libsqueeze/support-template.c	2007-11-04 13:13:51 UTC (rev 26254)
@@ -22,3 +22,30 @@
 #include <thunar-vfs/thunar-vfs.h>
 
 #include "support-template.h"
+
+GType
+lsq_support_template_get_property_type(LSQSupportTemplate *templ, guint nr)
+{
+    g_return_val_if_fail(nr < templ->n_properties, G_TYPE_NONE);
+    return templ->property_types[nr];
+}
+
+const gchar *
+lsq_support_template_get_property_name(LSQSupportTemplate *templ, guint nr)
+{
+    g_return_val_if_fail(nr < templ->n_properties, NULL);
+    return templ->property_names[nr];
+}
+
+guint
+lsq_support_template_get_n_properties (LSQSupportTemplate *templ)
+{
+    g_return_val_if_fail(templ->n_properties < 0, 0);
+    return templ->n_properties;
+}
+
+
+void
+lsq_support_template_set_property_type(LSQSupportTemplate *templ, guint nr, GType type)
+{
+}

Modified: squeeze/trunk/libsqueeze/support-template.h
===================================================================
--- squeeze/trunk/libsqueeze/support-template.h	2007-11-04 12:16:29 UTC (rev 26253)
+++ squeeze/trunk/libsqueeze/support-template.h	2007-11-04 13:13:51 UTC (rev 26254)
@@ -43,6 +43,10 @@
 	gchar **required_apps;
 	gboolean supported;
 
+    guint n_properties;
+    GType *property_types;
+    gchar **property_names;
+
 	gchar **new_cmd_queue;
 	gchar **add_cmd_queue;
 	gchar **remove_cmd_queue;
@@ -51,6 +55,16 @@
 	LSQSupportType   support_mask;
 };
 
+GType
+lsq_support_template_get_property_type(LSQSupportTemplate *s_template, guint n);
+const gchar *
+lsq_support_template_get_property_name(LSQSupportTemplate *s_template, guint n);
+guint
+lsq_support_template_get_n_properties (LSQSupportTemplate *s_template);
 
+void
+lsq_support_template_set_property_type(LSQSupportTemplate *s_template, guint n, GType type);
+
+
 #endif /* __SUPPORT_TEMPLATE_H__ */