From f48c567e2798b0dc50cd716d6ea83aa40f634f4e Mon Sep 17 00:00:00 2001 From: Nils Faerber Date: Fri, 12 May 2006 11:59:22 +0000 Subject: [PATCH] * Removed tny-password-dialog.* again, no longer needed. pmo-trunk-r47 --- src/Makefile.am | 4 +- src/tny-password-dialog.c | 166 --------------------------------------------- src/tny-password-dialog.h | 56 --------------- 3 files changed, 1 insertion(+), 225 deletions(-) delete mode 100644 src/tny-password-dialog.c delete mode 100644 src/tny-password-dialog.h diff --git a/src/Makefile.am b/src/Makefile.am index 4e13a8e..cbfc400 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,9 +34,7 @@ modest_SOURCES=\ modest-tny-msg-view.c\ modest-proto.h\ modest-proto.c\ - modest-ui.h\ - tny-password-dialog.c\ - tny-password-dialog.h + modest-ui.h modest_LDADD = \ $(MODEST_GSTUFF_LIBS) \ diff --git a/src/tny-password-dialog.c b/src/tny-password-dialog.c deleted file mode 100644 index 8a6baba..0000000 --- a/src/tny-password-dialog.c +++ /dev/null @@ -1,166 +0,0 @@ -/* tinymail - Tiny Mail - * Copyright (C) 2006-2007 Philip Van Hoof - * - * This library 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) any later version. - * - * This library 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 self library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/* TODO: Refactory this type to libtinymailui-gtk */ - -#include -#include - -static GObjectClass *parent_class = NULL; - -typedef struct _TnyPasswordDialogPriv TnyPasswordDialogPriv; - -struct _TnyPasswordDialogPriv -{ - GtkEntry *pwd_entry; - GtkLabel *prompt_label; -}; - -#define TNY_PASSWORD_DIALOG_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_PASSWORD_DIALOG, TnyPasswordDialogPriv)) - - -/** - * tny_password_dialog_set_prompt: - * @self: A #TnyPasswordDialog object - * @prompt: The prompt to set - * - **/ -void -tny_password_dialog_set_prompt (TnyPasswordDialog *self, const gchar *prompt) -{ - TnyPasswordDialogPriv *priv = TNY_PASSWORD_DIALOG_GET_PRIVATE (self); - - gtk_label_set_text (priv->prompt_label, prompt); - - return; -} - -/** - * tny_password_dialog_get_password: - * @self: A #TnyPasswordDialog object - * - * Return value: The password (read-only) as typed by the user - **/ -const gchar* -tny_password_dialog_get_password (TnyPasswordDialog *self) -{ - TnyPasswordDialogPriv *priv = TNY_PASSWORD_DIALOG_GET_PRIVATE (self); - - return gtk_entry_get_text (priv->pwd_entry); -} - -/** - * tny_summary_window_new: - * - * - * Return value: A new #TnyPasswordDialog instance implemented for Gtk+ - **/ -TnyPasswordDialog* -tny_password_dialog_new (void) -{ - TnyPasswordDialog *self = g_object_new (TNY_TYPE_PASSWORD_DIALOG, NULL); - - return self; -} - -static void -tny_password_dialog_instance_init (GTypeInstance *instance, gpointer g_class) -{ - TnyPasswordDialog *self = (TnyPasswordDialog *)instance; - TnyPasswordDialogPriv *priv = TNY_PASSWORD_DIALOG_GET_PRIVATE (self); - - gtk_dialog_add_buttons (GTK_DIALOG (self), GTK_STOCK_OK, GTK_RESPONSE_OK, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL); - - gtk_window_set_title (GTK_WINDOW (self), "Password input"); - - /* TODO: Add key icon or something */ - - priv->pwd_entry = GTK_ENTRY (gtk_entry_new ()); - priv->prompt_label = GTK_LABEL (gtk_label_new ("")); - - gtk_entry_set_visibility (priv->pwd_entry, FALSE); - - gtk_widget_show (GTK_WIDGET (priv->pwd_entry)); - gtk_widget_show (GTK_WIDGET (priv->prompt_label)); - - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (self)->vbox), - GTK_WIDGET (priv->prompt_label), TRUE, TRUE, 0); - - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (self)->vbox), - GTK_WIDGET (priv->pwd_entry), TRUE, TRUE, 0); - - return; -} - -static void -tny_password_dialog_finalize (GObject *object) -{ - TnyPasswordDialog *self = (TnyPasswordDialog *)object; - - (*parent_class->finalize) (object); - - return; -} - - -static void -tny_password_dialog_class_init (TnyPasswordDialogClass *class) -{ - GObjectClass *object_class; - - parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass*) class; - - object_class->finalize = tny_password_dialog_finalize; - - g_type_class_add_private (object_class, sizeof (TnyPasswordDialogPriv)); - - return; -} - -GType -tny_password_dialog_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY(type == 0)) - { - static const GTypeInfo info = - { - sizeof (TnyPasswordDialogClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) tny_password_dialog_class_init, /* class_init */ - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (TnyPasswordDialog), - 0, /* n_preallocs */ - tny_password_dialog_instance_init /* instance_init */ - }; - - type = g_type_register_static (GTK_TYPE_DIALOG, - "TnyPasswordDialog", - &info, 0); - - } - - return type; -} diff --git a/src/tny-password-dialog.h b/src/tny-password-dialog.h deleted file mode 100644 index a8072c6..0000000 --- a/src/tny-password-dialog.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef TNY_PASSWORD_DIALOG_H -#define TNY_PASSWORD_DIALOG_H - -/* tinymail - Tiny Mail - * Copyright (C) 2006-2007 Philip Van Hoof - * - * 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 self program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include -#include - -G_BEGIN_DECLS - -#define TNY_TYPE_PASSWORD_DIALOG (tny_password_dialog_get_type ()) -#define TNY_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_PASSWORD_DIALOG, TnyPasswordDialog)) -#define TNY_PASSWORD_DIALOG_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_PASSWORD_DIALOG, TnyPasswordDialogClass)) -#define TNY_IS_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_PASSWORD_DIALOG)) -#define TNY_IS_PASSWORD_DIALOG_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_PASSWORD_DIALOG)) -#define TNY_PASSWORD_DIALOG_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_PASSWORD_DIALOG, TnyPasswordDialogClass)) - -typedef struct _TnyPasswordDialog TnyPasswordDialog; -typedef struct _TnyPasswordDialogClass TnyPasswordDialogClass; - -struct _TnyPasswordDialog -{ - GtkDialog parent; -}; - -struct _TnyPasswordDialogClass -{ - GtkDialogClass parent_class; -}; - -GType tny_password_dialog_get_type (void); -TnyPasswordDialog* tny_password_dialog_new (void); - -const gchar* tny_password_dialog_get_password (TnyPasswordDialog *self); -void tny_password_dialog_set_prompt (TnyPasswordDialog *self, const gchar *prompt); - -G_END_DECLS - -#endif -- 1.7.9.5