svnno****@sourc*****
svnno****@sourc*****
Wed Mar 28 09:58:36 JST 2007
Revision: 3067
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3067
Author: ikezoe
Date: 2007-03-28 09:58:36 +0900 (Wed, 28 Mar 2007)
Log Message:
-----------
* src/dialogs/kz-password-manager-dialog.[ch]: kz_password_manager_dialog_new
gets GtkWindow instead of KzWindow as an argument.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/dialogs/kz-password-manager-dialog.c
kazehakase/trunk/src/dialogs/kz-password-manager-dialog.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-28 00:51:21 UTC (rev 3066)
+++ kazehakase/trunk/ChangeLog 2007-03-28 00:58:36 UTC (rev 3067)
@@ -4,6 +4,8 @@
instead of KzWindow as an argument.
* src/dialogs/kz-copy-format-dialog.[ch]: kz_copy_format_dialog_new
gets GtkWindow instead of KzWindow as an argument.
+ * src/dialogs/kz-password-manager-dialog.[ch]: kz_password_manager_dialog_new
+ gets GtkWindow instead of KzWindow as an argument.
2007-03-28 Kouhei Sutou <kou****@cozmi*****>
Modified: kazehakase/trunk/src/dialogs/kz-password-manager-dialog.c
===================================================================
--- kazehakase/trunk/src/dialogs/kz-password-manager-dialog.c 2007-03-28 00:51:21 UTC (rev 3066)
+++ kazehakase/trunk/src/dialogs/kz-password-manager-dialog.c 2007-03-28 00:58:36 UTC (rev 3067)
@@ -31,7 +31,7 @@
enum {
PROP_0,
- PROP_KZ_WINDOW
+ PROP_PARENT_WINDOW
};
enum {
@@ -80,11 +80,11 @@
g_object_class_install_property
(gobject_class,
- PROP_KZ_WINDOW,
- g_param_spec_object("kz-window",
- _("KzWindow"),
+ PROP_PARENT_WINDOW,
+ g_param_spec_object("parent-window",
+ _("ParentWindow"),
_("The parent kazehakase window"),
- KZ_TYPE_WINDOW,
+ GTK_TYPE_WINDOW,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
}
@@ -99,7 +99,7 @@
GtkTreeViewColumn *col;
GtkTreeSelection *selection;
- password_manager->kz = NULL;
+ password_manager->parent_window = NULL;
main_vbox = GTK_DIALOG(password_manager)->vbox;
gtk_box_set_spacing(GTK_BOX(main_vbox), 4);
@@ -191,7 +191,7 @@
gtk_window_set_title(GTK_WINDOW(password_manager), _("Password Manager"));
gtk_window_set_transient_for(GTK_WINDOW(password_manager),
- GTK_WINDOW(password_manager->kz));
+ GTK_WINDOW(password_manager->parent_window));
#warning FIXME! KzProfile should handle password.
result = kz_embed_prefs_get_passwords(embed_prefs, &list);
@@ -226,10 +226,10 @@
{
KzPasswordManagerDialog *password_manager = KZ_PASSWORD_MANAGER_DIALOG(object);
- if (password_manager->kz)
+ if (password_manager->parent_window)
{
- g_object_unref(password_manager->kz);
- password_manager->kz = NULL;
+ g_object_unref(password_manager->parent_window);
+ password_manager->parent_window = NULL;
}
if (password_manager->list_store)
@@ -253,8 +253,8 @@
switch (prop_id)
{
- case PROP_KZ_WINDOW:
- password_manager->kz = g_object_ref(g_value_get_object(value));
+ case PROP_PARENT_WINDOW:
+ password_manager->parent_window = g_object_ref(g_value_get_object(value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -273,8 +273,8 @@
switch (prop_id)
{
- case PROP_KZ_WINDOW:
- g_value_set_object(value, password_manager->kz);
+ case PROP_PARENT_WINDOW:
+ g_value_set_object(value, password_manager->parent_window);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -284,10 +284,10 @@
GtkWidget *
-kz_password_manager_dialog_new (KzWindow *kz)
+kz_password_manager_dialog_new (GtkWindow *parent_window)
{
return GTK_WIDGET(g_object_new(KZ_TYPE_PASSWORD_MANAGER_DIALOG,
- "kz-window", kz,
+ "parent-window", parent_window,
NULL));
}
@@ -301,7 +301,7 @@
g_return_if_fail (KZ_IS_PASSWORD_MANAGER_DIALOG(dialog));
password_manager = KZ_PASSWORD_MANAGER_DIALOG(dialog);
- if (!password_manager->kz) return;
+ if (!password_manager->parent_window) return;
switch (arg) {
case GTK_RESPONSE_CLOSE:
Modified: kazehakase/trunk/src/dialogs/kz-password-manager-dialog.h
===================================================================
--- kazehakase/trunk/src/dialogs/kz-password-manager-dialog.h 2007-03-28 00:51:21 UTC (rev 3066)
+++ kazehakase/trunk/src/dialogs/kz-password-manager-dialog.h 2007-03-28 00:58:36 UTC (rev 3067)
@@ -23,8 +23,6 @@
#include <gtk/gtk.h>
-#include "kz-window.h"
-
G_BEGIN_DECLS
#define KZ_TYPE_PASSWORD_MANAGER_DIALOG (kz_password_manager_dialog_get_type ())
@@ -47,7 +45,7 @@
{
GtkDialog parent;
- KzWindow *kz;
+ GtkWindow *parent_window;
GtkWidget *scrolled_window;
GtkTreeView *tree_view;
@@ -60,7 +58,7 @@
};
GType kz_password_manager_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget *kz_password_manager_dialog_new (KzWindow *kz);
+GtkWidget *kz_password_manager_dialog_new (GtkWindow *parent_window);
G_END_DECLS