GNOME.org
 

[anjal] Composer : Removed e-composer-header.[ch]

commit e72347ca61de944397d6d191d2e53bd68c327f33
Author: Johnny Jacob <jjohnny novell com>
Date:   Mon Mar 23 14:55:44 2009 +0530

    Composer : Removed e-composer-header.[ch]
---
 src/Makefile.am               |    2 -
 src/e-composer-header-table.h |    2 +-
 src/e-composer-header.c       |  444 -----------------------------------------
 src/e-composer-header.h       |   77 -------
 4 files changed, 1 insertions(+), 524 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index eb221a0..8fffd89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,8 +41,6 @@ anjal_SOURCES = \
 	mail-message-view.h \
 	e-msg-composer-utils.c \
 	e-msg-composer-utils.h \
-	e-composer-header.c \
-	e-composer-header.h \
 	e-composer-header-table.c \
 	e-composer-header-table.h \
 	e-msg-composer.h \
diff --git a/src/e-composer-header-table.h b/src/e-composer-header-table.h
index e3af16e..53d417b 100644
--- a/src/e-composer-header-table.h
+++ b/src/e-composer-header-table.h
@@ -26,7 +26,7 @@
 #include <e-util/e-signature.h>
 #include <e-util/e-signature-list.h>
 
-#include "e-composer-header.h"
+#include <composer/e-composer-header.h>
 
 /* Standard GObject macros */
 #define E_TYPE_COMPOSER_HEADER_TABLE \
diff --git a/src/e-composer-header.c b/src/e-composer-header.c
deleted file mode 100644
index f85d455..0000000
--- a/src/e-composer-header.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/*Modified for Anjal - Johnny Jacob <jjohnny novell com>*/
-
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
- *
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include "e-composer-header.h"
-
-#define E_COMPOSER_HEADER_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_COMPOSER_HEADER, EComposerHeaderPrivate))
-
-enum {
-	PROP_0,
-	PROP_BUTTON,
-	PROP_LABEL,
-	PROP_ADDACTION,
-	PROP_ADDACTION_TEXT,
-	PROP_SENSITIVE,
-	PROP_VISIBLE
-};
-
-enum {
-	CHANGED,
-	CLICKED,
-	LAST_SIGNAL
-};
-
-struct _EComposerHeaderPrivate {
-	gchar *label;
-	gchar *addaction_text;
-	gboolean button;
-	gboolean addaction; /*For Add button.*/
-};
-
-static gpointer parent_class;
-static guint signal_ids[LAST_SIGNAL];
-
-static void
-composer_header_button_clicked_cb (GtkButton *button,
-                                   EComposerHeader *header)
-{
-	gtk_widget_grab_focus (header->input_widget);
-	g_signal_emit (header, signal_ids[CLICKED], 0);
-}
-
-static void
-composer_header_addaction_clicked_cb (GtkButton *button,
-				      EComposerHeader *header)
-{
-	gtk_widget_hide (button);
-	e_composer_header_set_visible (header, TRUE);
-}
-
-static GObject *
-composer_header_constructor (GType type,
-                             guint n_construct_properties,
-                             GObjectConstructParam *construct_properties)
-{
-	GObject *object;
-	GtkWidget *widget;
-	EComposerHeader *header;
-
-	/* Chain up to parent's constructor() method. */
-	object = G_OBJECT_CLASS (parent_class)->constructor (
-		type, n_construct_properties, construct_properties);
-
-	header = E_COMPOSER_HEADER (object);
-
-	if (header->priv->button) {
-		widget = gtk_button_new_with_mnemonic (header->priv->label);
-		GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
-		g_signal_connect (
-			widget, "clicked",
-			G_CALLBACK (composer_header_button_clicked_cb),
-			header);
-	} else {
-		widget = gtk_label_new_with_mnemonic (header->priv->label);
-		gtk_label_set_mnemonic_widget (
-			GTK_LABEL (widget), header->input_widget);
-	}
-
-	if (header->priv->addaction) {
-		header->action_widget = gtk_link_button_new_with_label (header->priv->label, 
-									header->priv->addaction_text);
-		g_signal_connect (
-			header->action_widget, "clicked",
-			G_CALLBACK (composer_header_addaction_clicked_cb),
-			header);
-
-		/*TODO : Add + icon*/
-		/* widget = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU); */
-		/* gtk_button_set_image (header->action_widget, widget); */
-	}
-
-	header->title_widget = g_object_ref_sink (widget);
-
-	g_free (header->priv->label);
-	header->priv->label = NULL;
-
-	return object;
-}
-
-static void
-composer_header_set_property (GObject *object,
-                              guint property_id,
-                              const GValue *value,
-                              GParamSpec *pspec)
-{
-	EComposerHeaderPrivate *priv;
-
-	priv = E_COMPOSER_HEADER_GET_PRIVATE (object);
-
-	switch (property_id) {
-		case PROP_BUTTON:	/* construct only */
-			priv->button = g_value_get_boolean (value);
-			return;
-
-		case PROP_ADDACTION:	/* construct only */
-			priv->addaction = g_value_get_boolean (value);
-			return;
-
-		case PROP_ADDACTION_TEXT:/* construct only */
-			priv->addaction_text = g_value_dup_string (value);
-			return;
-
-		case PROP_LABEL:	/* construct only */
-			priv->label = g_value_dup_string (value);
-			return;
-
-		case PROP_SENSITIVE:
-			e_composer_header_set_sensitive (
-				E_COMPOSER_HEADER (object),
-				g_value_get_boolean (value));
-			return;
-
-		case PROP_VISIBLE:
-			e_composer_header_set_visible (
-				E_COMPOSER_HEADER (object),
-				g_value_get_boolean (value));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-composer_header_get_property (GObject *object,
-                              guint property_id,
-                              GValue *value,
-                              GParamSpec *pspec)
-{
-	EComposerHeaderPrivate *priv;
-
-	priv = E_COMPOSER_HEADER_GET_PRIVATE (object);
-
-	switch (property_id) {
-		case PROP_BUTTON:	/* construct only */
-			g_value_set_boolean (value, priv->button);
-			return;
-
-		case PROP_ADDACTION:	/* construct only */
-			g_value_set_boolean (value, priv->button);
-			return;
-
-		case PROP_ADDACTION_TEXT:	/* construct only */
-			g_value_take_string (
-				value, priv->addaction_text);
-			return;
-
-		case PROP_LABEL:	/* construct only */
-			g_value_take_string (
-				value, e_composer_header_get_label (
-				E_COMPOSER_HEADER (object)));
-			return;
-
-		case PROP_SENSITIVE:
-			g_value_set_boolean (
-				value, e_composer_header_get_sensitive (
-				E_COMPOSER_HEADER (object)));
-			return;
-
-		case PROP_VISIBLE:
-			g_value_set_boolean (
-				value, e_composer_header_get_visible (
-				E_COMPOSER_HEADER (object)));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-composer_header_dispose (GObject *object)
-{
-	EComposerHeader *header = E_COMPOSER_HEADER (object);
-
-	if (header->title_widget != NULL) {
-		g_object_unref (header->title_widget);
-		header->title_widget = NULL;
-	}
-
-	if (header->input_widget != NULL) {
-		g_object_unref (header->input_widget);
-		header->input_widget = NULL;
-	}
-
-	/* Chain up to parent's dispose() method. */
-	G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-composer_header_class_init (EComposerHeaderClass *class)
-{
-	GObjectClass *object_class;
-
-	parent_class = g_type_class_peek_parent (class);
-	g_type_class_add_private (class, sizeof (EComposerHeaderPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructor = composer_header_constructor;
-	object_class->set_property = composer_header_set_property;
-	object_class->get_property = composer_header_get_property;
-	object_class->dispose = composer_header_dispose;
-
-	g_object_class_install_property (
-		object_class,
-		PROP_BUTTON,
-		g_param_spec_boolean (
-			"button",
-			NULL,
-			NULL,
-			FALSE,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
-
-	g_object_class_install_property (
-		object_class,
-		PROP_ADDACTION,
-		g_param_spec_boolean (
-			"addaction",
-			NULL,
-			NULL,
-			FALSE,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
-
-	g_object_class_install_property (
-		object_class,
-		PROP_ADDACTION_TEXT,
-		g_param_spec_string (
-			"addaction_text",
-			NULL,
-			NULL,
-			NULL,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
-
-	g_object_class_install_property (
-		object_class,
-		PROP_LABEL,
-		g_param_spec_string (
-			"label",
-			NULL,
-			NULL,
-			NULL,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
-
-	g_object_class_install_property (
-		object_class,
-		PROP_SENSITIVE,
-		g_param_spec_boolean (
-			"sensitive",
-			NULL,
-			NULL,
-			FALSE,
-			G_PARAM_READWRITE));
-
-	g_object_class_install_property (
-		object_class,
-		PROP_VISIBLE,
-		g_param_spec_boolean (
-			"visible",
-			NULL,
-			NULL,
-			FALSE,
-			G_PARAM_READWRITE));
-
-	signal_ids[CHANGED] = g_signal_new (
-		"changed",
-		G_TYPE_FROM_CLASS (class),
-		G_SIGNAL_RUN_LAST,
-		0, NULL, NULL,
-		g_cclosure_marshal_VOID__VOID,
-		G_TYPE_NONE, 0);
-
-	signal_ids[CLICKED] = g_signal_new (
-		"clicked",
-		G_TYPE_FROM_CLASS (class),
-		G_SIGNAL_RUN_LAST,
-		0, NULL, NULL,
-		g_cclosure_marshal_VOID__VOID,
-		G_TYPE_NONE, 0);
-}
-
-static void
-composer_header_init (EComposerHeader *header)
-{
-	header->priv = E_COMPOSER_HEADER_GET_PRIVATE (header);
-}
-
-GType
-e_composer_header_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0)) {
-		static const GTypeInfo type_info = {
-			sizeof (EComposerHeaderClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) composer_header_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL,  /* class_data */
-			sizeof (EComposerHeader),
-			0,     /* n_preallocs */
-			(GInstanceInitFunc) composer_header_init,
-			NULL   /* value_table */
-		};
-
-		type = g_type_register_static (
-			G_TYPE_OBJECT, "EComposerHeader",
-			&type_info, G_TYPE_FLAG_ABSTRACT);
-	}
-
-	return type;
-}
-
-gchar *
-e_composer_header_get_label (EComposerHeader *header)
-{
-	gchar *label;
-
-	g_return_val_if_fail (E_IS_COMPOSER_HEADER (header), NULL);
-
-	/* GtkButton and GtkLabel both have a "label" property. */
-	g_object_get (header->title_widget, "label", &label, NULL);
-
-	return label;
-}
-
-gboolean
-e_composer_header_get_sensitive (EComposerHeader *header)
-{
-	gboolean sensitive;
-
-	g_return_val_if_fail (E_IS_COMPOSER_HEADER (header), FALSE);
-
-	sensitive = GTK_WIDGET_SENSITIVE (header->title_widget);
-	if (GTK_WIDGET_SENSITIVE (header->input_widget) != sensitive)
-		g_warning ("%s: Sensitivity is out of sync", G_STRFUNC);
-
-	return sensitive;
-}
-
-void
-e_composer_header_set_sensitive (EComposerHeader *header,
-                                 gboolean sensitive)
-{
-	g_return_if_fail (E_IS_COMPOSER_HEADER (header));
-
-	gtk_widget_set_sensitive (header->title_widget, sensitive);
-	gtk_widget_set_sensitive (header->input_widget, sensitive);
-
-	g_object_notify (G_OBJECT (header), "sensitive");
-}
-
-gboolean
-e_composer_header_get_visible (EComposerHeader *header)
-{
-	gboolean visible;
-
-	g_return_val_if_fail (E_IS_COMPOSER_HEADER (header), FALSE);
-
-	visible = GTK_WIDGET_VISIBLE (header->title_widget);
-	if (GTK_WIDGET_VISIBLE (header->input_widget) != visible)
-		g_warning ("%s: Visibility is out of sync", G_STRFUNC);
-
-	return visible;
-}
-
-void
-e_composer_header_set_visible (EComposerHeader *header,
-                               gboolean visible)
-{
-	g_return_if_fail (E_IS_COMPOSER_HEADER (header));
-
-	if (visible) {
-		gtk_widget_show (header->title_widget);
-		gtk_widget_show (header->input_widget);
-	} else {
-		gtk_widget_hide (header->title_widget);
-		gtk_widget_hide (header->input_widget);
-	}
-
-	g_object_notify (G_OBJECT (header), "visible");
-}
-
-void
-e_composer_header_set_title_tooltip (EComposerHeader *header,
-                                     const gchar *tooltip)
-{
-	g_return_if_fail (E_IS_COMPOSER_HEADER (header));
-
-	gtk_widget_set_tooltip_text (header->title_widget, tooltip);
-}
-
-void
-e_composer_header_set_input_tooltip (EComposerHeader *header,
-                                     const gchar *tooltip)
-{
-	g_return_if_fail (E_IS_COMPOSER_HEADER (header));
-
-	gtk_widget_set_tooltip_text (header->input_widget, tooltip);
-}
diff --git a/src/e-composer-header.h b/src/e-composer-header.h
deleted file mode 100644
index 92cdd6d..0000000
--- a/src/e-composer-header.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- */
-
-#ifndef E_COMPOSER_HEADER_H
-#define E_COMPOSER_HEADER_H
-
-#include <composer/e-composer-common.h>
-
-/* Standard GObject macros */
-#define E_TYPE_COMPOSER_HEADER \
-	(e_composer_header_get_type ())
-#define E_COMPOSER_HEADER(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_COMPOSER_HEADER, EComposerHeader))
-#define E_COMPOSER_HEADER_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((obj), E_TYPE_COMPOSER_HEADER, EComposerHeaderClass))
-#define E_IS_COMPOSER_HEADER(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_COMPOSER_HEADER))
-#define E_IS_COMPOSER_HEADER_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_COMPOSER_HEADER))
-#define E_COMPOSER_HEADER_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_COMPOSER_HEADER, EComposerHeaderClass))
-
-G_BEGIN_DECLS
-
-typedef struct _EComposerHeader EComposerHeader;
-typedef struct _EComposerHeaderClass EComposerHeaderClass;
-typedef struct _EComposerHeaderPrivate EComposerHeaderPrivate;
-
-struct _EComposerHeader {
-	GObject parent;
-	GtkWidget *title_widget;
-	GtkWidget *input_widget;
-        GtkWidget *action_widget;
-	EComposerHeaderPrivate *priv;
-};
-
-struct _EComposerHeaderClass {
-	GObjectClass parent_class;
-};
-
-GType		e_composer_header_get_type	(void);
-gchar *		e_composer_header_get_label	(EComposerHeader *header);
-gboolean	e_composer_header_get_sensitive	(EComposerHeader *header);
-void		e_composer_header_set_sensitive (EComposerHeader *header,
-						 gboolean sensitive);
-gboolean	e_composer_header_get_visible	(EComposerHeader *header);
-void		e_composer_header_set_visible	(EComposerHeader *header,
-						 gboolean visible);
-void		e_composer_header_set_title_tooltip
-						(EComposerHeader *header,
-						 const gchar *tooltip);
-void		e_composer_header_set_input_tooltip
-						(EComposerHeader *header,
-						 const gchar *tooltip);
-
-G_END_DECLS
-
-#endif /* E_COMPOSER_HEADER_H */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]