Move GoaEditableLabel to goabackend

Signed-off-by: David Zeuthen <davidz@redhat.com>

8 files changed, 82 insertions, 75 deletions

diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index 3a9d22e..1e7f2ad 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -44,6 +44,7 @@ libgoa_backend_1_0_la_HEADERS =						\
 	goabackendenums.h						\
 	goabackendenumtypes.h						\
 	goalogging.h							\
+	goaeditablelabel.h						\
 	goaprovider.h							\
 	goagenericmailprovider.h					\
 	goaoauthprovider.h						\
@@ -64,6 +65,7 @@ libgoa_backend_1_0_la_SOURCES =						\
 	goabackendtypes.h						\
 	goabackendenums.h						\
 	goabackendenumtypes.h		goabackendenumtypes.c		\
+	goaeditablelabel.h		goaeditablelabel.c		\
 	goaprovider.h			goaprovider.c			\
 	goalogging.h			goalogging.c			\
 	goagenericmailprovider.h	goagenericmailprovider.c	\
diff --git a/src/goabackend/goabackend.h b/src/goabackend/goabackend.h
index 46b5c77..f5d177b 100644
--- a/src/goabackend/goabackend.h
+++ b/src/goabackend/goabackend.h
@@ -30,6 +30,7 @@
 #define __GOA_BACKEND_INSIDE_GOA_BACKEND_H__
 #include <goabackend/goabackendtypes.h>
 #include <goabackend/goalogging.h>
+#include <goabackend/goaeditablelabel.h>
 #include <goabackend/goaprovider.h>
 #include <goabackend/goagenericmailprovider.h>
 #include <goabackend/goaoauthprovider.h>
diff --git a/src/goabackend/goabackendtypes.h b/src/goabackend/goabackendtypes.h
index 7087e80..310bb00 100644
--- a/src/goabackend/goabackendtypes.h
+++ b/src/goabackend/goabackendtypes.h
@@ -72,6 +72,9 @@ typedef struct _GoaImapClient GoaImapClient;
 struct _GoaImapMail;
 typedef struct _GoaImapMail GoaImapMail;
 
+struct _GoaEditableLabel;
+typedef struct _GoaEditableLabel GoaEditableLabel;
+
 G_END_DECLS
 
 #endif /* __GOA_BACKEND_TYPES_H__ */
diff --git a/src/panel/goaeditablelabel.c b/src/goabackend/goaeditablelabel.c
index f237aaa..f237aaa 100644
--- a/src/panel/goaeditablelabel.c
+++ b/src/goabackend/goaeditablelabel.c
diff --git a/src/goabackend/goaeditablelabel.h b/src/goabackend/goaeditablelabel.h
new file mode 100644
index 0000000..b47876f
--- /dev/null
+++ b/src/goabackend/goaeditablelabel.h
@@ -0,0 +1,76 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright 2009-2010  Red Hat, Inc,
+ *
+ * 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 3 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.
+ *
+ * Based on panels/user-accounts/um-editable-entry.c from
+ * gnome-control-center by Matthias Clasen <mclasen@redhat.com>
+ */
+
+
+#if !defined (__GOA_BACKEND_INSIDE_GOA_BACKEND_H__) && !defined (GOA_BACKEND_COMPILATION)
+#error "Only <goabackend/goabackend.h> can be included directly."
+#endif
+
+#ifndef __GOA_EDITABLE_LABEL_H__
+#define __GOA_EDITABLE_LABEL_H__
+
+#include <goabackend/goabackendtypes.h>
+
+G_BEGIN_DECLS
+
+#define GOA_TYPE_EDITABLE_LABEL         (goa_editable_label_get_type ())
+#define GOA_EDITABLE_LABEL(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_EDITABLE_LABEL, GoaEditableLabel))
+#define GOA_EDITABLE_LABEL_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), GOA_TYPE_EDITABLE_LABEL, GoaEditableLabelClass))
+#define GOA_IS_EDITABLE_LABEL(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_EDITABLE_LABEL))
+#define GOA_IS_EDITABLE_LABEL_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GOA_TYPE_EDITABLE_LABEL))
+#define GOA_EDITABLE_LABEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOA_TYPE_EDITABLE_LABEL, GoaEditableLabelClass))
+
+typedef struct _GoaEditableLabelClass GoaEditableLabelClass;
+typedef struct _GoaEditableLabelPrivate GoaEditableLabelPrivate;
+
+struct _GoaEditableLabel
+{
+  GtkAlignment parent;
+
+  GoaEditableLabelPrivate *priv;
+};
+
+struct _GoaEditableLabelClass
+{
+  GtkAlignmentClass parent_class;
+
+  void (* editing_done) (GoaEditableLabel *entry);
+};
+
+GType        goa_editable_label_get_type     (void) G_GNUC_CONST;
+GtkWidget   *goa_editable_label_new          (void);
+void         goa_editable_label_set_text     (GoaEditableLabel  *entry,
+                                              const gchar       *text);
+const gchar *goa_editable_label_get_text     (GoaEditableLabel  *entry);
+void         goa_editable_label_set_editable (GoaEditableLabel  *entry,
+                                              gboolean           editable);
+gboolean     goa_editable_label_get_editable (GoaEditableLabel  *entry);
+void         goa_editable_label_set_weight   (GoaEditableLabel  *entry,
+                                              gint               weight);
+gint         goa_editable_label_get_weight   (GoaEditableLabel  *entry);
+void         goa_editable_label_set_scale    (GoaEditableLabel  *entry,
+                                              gdouble            scale);
+gdouble      goa_editable_label_get_scale    (GoaEditableLabel  *entry);
+
+G_END_DECLS
+
+#endif /* _GOA_EDITABLE_LABEL_H_ */
diff --git a/src/panel/Makefile.am b/src/panel/Makefile.am
index e167f0b..4383b3d 100644
--- a/src/panel/Makefile.am
+++ b/src/panel/Makefile.am
@@ -22,7 +22,6 @@ ccpanels_LTLIBRARIES = libgoa-panel.la
 libgoa_panel_la_SOURCES =					\
 	goapanel.h			goapanel.c		\
 	goapanelaccountsmodel.h		goapanelaccountsmodel.c	\
-	goaeditablelabel.h		goaeditablelabel.c	\
 	$(NULL)
 
 libgoa_panel_la_CFLAGS =					\
diff --git a/src/panel/goaeditablelabel.h b/src/panel/goaeditablelabel.h
deleted file mode 100644
index 8d7cf0c..0000000
--- a/src/panel/goaeditablelabel.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright 2009-2010  Red Hat, Inc,
- *
- * 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 3 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.
- *
- * Based on panels/user-accounts/um-editable-entry.c from
- * gnome-control-center by Matthias Clasen <mclasen@redhat.com>
- */
-
-#ifndef _GOA_EDITABLE_LABEL_H_
-#define _GOA_EDITABLE_LABEL_H_
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GOA_TYPE_EDITABLE_LABEL  goa_editable_label_get_type()
-
-#define GOA_EDITABLE_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GOA_TYPE_EDITABLE_LABEL, GoaEditableLabel))
-#define GOA_EDITABLE_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GOA_TYPE_EDITABLE_LABEL, GoaEditableLabelClass))
-#define GOA_IS_EDITABLE_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GOA_TYPE_EDITABLE_LABEL))
-#define GOA_IS_EDITABLE_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GOA_TYPE_EDITABLE_LABEL))
-#define GOA_EDITABLE_LABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GOA_TYPE_EDITABLE_LABEL, GoaEditableLabelClass))
-
-typedef struct _GoaEditableLabel GoaEditableLabel;
-typedef struct _GoaEditableLabelClass GoaEditableLabelClass;
-typedef struct _GoaEditableLabelPrivate GoaEditableLabelPrivate;
-
-struct _GoaEditableLabel
-{
-  GtkAlignment parent;
-
-  GoaEditableLabelPrivate *priv;
-};
-
-struct _GoaEditableLabelClass
-{
-  GtkAlignmentClass parent_class;
-
-  void (* editing_done) (GoaEditableLabel *entry);
-};
-
-GType        goa_editable_label_get_type     (void) G_GNUC_CONST;
-GtkWidget   *goa_editable_label_new          (void);
-void         goa_editable_label_set_text     (GoaEditableLabel *entry,
-                                              const gchar     *text);
-const gchar *goa_editable_label_get_text     (GoaEditableLabel *entry);
-void         goa_editable_label_set_editable (GoaEditableLabel *entry,
-                                              gboolean         editable);
-gboolean     goa_editable_label_get_editable (GoaEditableLabel *entry);
-void         goa_editable_label_set_weight   (GoaEditableLabel *entry,
-                                              gint             weight);
-gint         goa_editable_label_get_weight   (GoaEditableLabel *entry);
-void         goa_editable_label_set_scale    (GoaEditableLabel *entry,
-                                              gdouble          scale);
-gdouble      goa_editable_label_get_scale    (GoaEditableLabel *entry);
-
-G_END_DECLS
-
-#endif /* _GOA_EDITABLE_LABEL_H_ */
diff --git a/src/panel/goapanel.c b/src/panel/goapanel.c
index 9cd1a29..0aa581d 100644
--- a/src/panel/goapanel.c
+++ b/src/panel/goapanel.c
@@ -30,7 +30,6 @@
 
 #include "goapanel.h"
 #include "goapanelaccountsmodel.h"
-#include "goaeditablelabel.h"
 
 typedef struct _GoaPanelClass GoaPanelClass;