[dia] Ooops: forgot diacontext.[hc]
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] Ooops: forgot diacontext.[hc]
- Date: Sat, 21 Jul 2012 16:21:00 +0000 (UTC)
commit d80cf44fe2383c3f4961823fdb995c8b7699e5c4
Author: Hans Breuer <hans breuer org>
Date: Sat Jul 21 18:20:41 2012 +0200
Ooops: forgot diacontext.[hc]
lib/Makefile.am | 2 +
lib/diacontext.c | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/diacontext.h | 21 ++++++
3 files changed, 222 insertions(+), 0 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1fca5ca..500a31a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -184,6 +184,8 @@ libdia_la_SOURCES = \
prefs.h \
dialib.c \
dialib.h \
+ diacontext.c \
+ diacontext.h \
\
diacellrendererproperty.c \
diacellrendererproperty.h \
diff --git a/lib/diacontext.c b/lib/diacontext.c
new file mode 100644
index 0000000..f214647
--- /dev/null
+++ b/lib/diacontext.c
@@ -0,0 +1,199 @@
+/* dia -- an diagram creation/manipulation program
+ * Copyright (C) 1998 Alexander Larsson
+ *
+ * diacontext.c --
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include "diacontext.h"
+
+/* DiaContext should be used to
+ * - let the caller decide about user notfication and not the callee
+ * - help writing thread-aware library functions
+ * - cleanup message_*() usage in dia/lib, dia/plug-ins and dia/objects
+ */
+
+#include <glib-object.h>
+#include <string.h>
+
+#include "message.h" /* just for testing */
+
+typedef struct _DiaContextClass DiaContextClass;
+#define DIA_TYPE_CONTEXT (dia_context_get_type ())
+GType dia_context_get_type (void) G_GNUC_CONST;
+
+struct _DiaContext
+{
+ GObject parent_instance;
+ /*< private >*/
+ gchar *desc;
+ gchar *filename;
+ GList *messages;
+};
+
+struct _DiaContextClass
+{
+ GObjectClass parent_class;
+};
+
+/* The use of GObject is intentionally hidden from the API */
+static void _dia_context_finalize (GObject *object);
+
+G_DEFINE_TYPE (DiaContext, _dia_context, DIA_TYPE_CONTEXT);
+static gpointer parent_class = NULL;
+
+static void
+_dia_context_finalize(GObject *object)
+{
+ DiaContext *context = (DiaContext *)object;
+
+ g_list_foreach (context->messages, (GFunc) g_free, NULL);
+ g_free (context->desc);
+ g_free (context->filename);
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+static void
+_dia_context_class_init(DiaContextClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ parent_class = g_type_class_peek_parent (klass);
+ object_class->finalize = _dia_context_finalize;
+}
+static void
+_dia_context_init(DiaContext *self)
+{
+ /* zero initialization should be right */
+}
+
+GType
+dia_context_get_type (void)
+{
+ static GType object_type = 0;
+
+ if (!object_type)
+ {
+ static const GTypeInfo object_info =
+ {
+ sizeof (DiaContextClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) _dia_context_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (DiaContext),
+ 0, /* n_preallocs */
+ NULL /* init */
+ };
+
+ object_type = g_type_register_static (G_TYPE_OBJECT,
+ "DiaContext",
+ &object_info, 0);
+ }
+
+ return object_type;
+}
+
+DiaContext *
+dia_context_new (const char *desc)
+{
+ DiaContext *context = g_object_new (DIA_TYPE_CONTEXT, NULL);
+ context->desc = g_strdup (desc);
+ return context;
+}
+
+void
+dia_context_release (DiaContext *context)
+{
+ /* FIXME: this should vanish */
+ if (context->messages)
+ message_warning ("%s:\n%s",
+ context->desc ? context->desc : "<no context>",
+ context->messages->data);
+
+ g_object_unref (G_OBJECT (context));
+}
+
+void
+dia_context_set_filename (DiaContext *context,
+ const char *filename)
+{
+ g_return_if_fail (context != NULL);
+
+ if (context->filename)
+ g_free (context->filename);
+ context->filename = g_strdup (filename);
+}
+
+const char *
+dia_context_get_filename (DiaContext *context)
+{
+ g_return_val_if_fail (context != NULL && context->filename, "");
+
+ return context->filename;
+}
+
+void
+dia_context_add_message (DiaContext *context,
+ const char *format, ...)
+{
+ gchar *msg;
+ va_list args;
+
+
+ g_return_if_fail (context != NULL);
+
+ g_return_if_fail (context != NULL);
+
+ va_start (args, format);
+
+ msg = g_strdup_vprintf (format, args);
+ va_end (args);
+ /* ToDo: dont repeat the same message over and over again, except ... */
+
+ context->messages = g_list_prepend (context->messages, msg);
+}
+
+void
+dia_context_add_message_with_errno (DiaContext *context, int nr,
+ const char *format, ...)
+{
+ gchar *errstr;
+ gchar *msg;
+ va_list args;
+
+ g_return_if_fail (context != NULL);
+
+ va_start (args, format);
+
+ msg = g_strdup_vprintf (format, args);
+ va_end (args);
+
+ errstr = (nr == 0) ? NULL : g_locale_to_utf8 (strerror(nr), -1, NULL, NULL, NULL);
+ if (errstr) {
+ gchar *tmp = g_strdup_printf ("%s\n%s", msg, errstr);
+
+ g_free (msg);
+ msg = tmp;
+ }
+ /* ToDo: dont repeat the same message over and over again, except ... */
+
+ context->messages = g_list_prepend (context->messages, msg);
+ g_free (errstr);
+}
diff --git a/lib/diacontext.h b/lib/diacontext.h
new file mode 100644
index 0000000..50da3f9
--- /dev/null
+++ b/lib/diacontext.h
@@ -0,0 +1,21 @@
+#ifndef DIA_CONTEXT_H
+#define DIA_CONTEXT_H
+
+#include "diatypes.h"
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+DiaContext *dia_context_new (const char *desc);
+void dia_context_release (DiaContext *context);
+
+void dia_context_set_filename (DiaContext *context, const char *filename);
+void dia_context_add_message (DiaContext *context, const char *fomat, ...);
+void dia_context_add_message_with_errno (DiaContext *context, int nr, const char *fomat, ...);
+
+const char *dia_context_get_filename (DiaContext *context);
+
+G_END_DECLS
+
+
+#endif /* DIA_CONTEXT_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]