svnno****@sourc*****
svnno****@sourc*****
Wed Mar 28 09:51:21 JST 2007
Revision: 3066
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3066
Author: ikezoe
Date: 2007-03-28 09:51:21 +0900 (Wed, 28 Mar 2007)
Log Message:
-----------
* src/dialogs/kz-about-dialog.[ch]: kz_about_dialog_new gets GtkWindow
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.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/dialogs/kz-about-dialog.c
kazehakase/trunk/src/dialogs/kz-about-dialog.h
kazehakase/trunk/src/dialogs/kz-copy-format-dialog.c
kazehakase/trunk/src/dialogs/kz-copy-format-dialog.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-28 00:48:00 UTC (rev 3065)
+++ kazehakase/trunk/ChangeLog 2007-03-28 00:51:21 UTC (rev 3066)
@@ -1,3 +1,10 @@
+2007-03-28 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * src/dialogs/kz-about-dialog.[ch]: kz_about_dialog_new gets GtkWindow
+ 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.
+
2007-03-28 Kouhei Sutou <kou****@cozmi*****>
* module/search/kz-hyper-estraier-search.c: keep DB opened while
Modified: kazehakase/trunk/src/dialogs/kz-about-dialog.c
===================================================================
--- kazehakase/trunk/src/dialogs/kz-about-dialog.c 2007-03-28 00:48:00 UTC (rev 3065)
+++ kazehakase/trunk/src/dialogs/kz-about-dialog.c 2007-03-28 00:51:21 UTC (rev 3066)
@@ -137,7 +137,7 @@
void
-kz_about_dialog_new (KzWindow *kz)
+kz_about_dialog_new (GtkWindow *parent_window)
{
GtkWidget *about_dialog;
GtkWidget *calendar;
@@ -152,7 +152,7 @@
gchar *logo_name;
about_dialog = gtk_dialog_new_with_buttons(_("About Kazehakase"),
- GTK_WINDOW(kz),
+ parent_window,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK,
GTK_RESPONSE_NONE,
Modified: kazehakase/trunk/src/dialogs/kz-about-dialog.h
===================================================================
--- kazehakase/trunk/src/dialogs/kz-about-dialog.h 2007-03-28 00:48:00 UTC (rev 3065)
+++ kazehakase/trunk/src/dialogs/kz-about-dialog.h 2007-03-28 00:51:21 UTC (rev 3066)
@@ -21,11 +21,11 @@
#ifndef __KZ_ABOUT_DIALOG_H__
#define __KZ_ABOUT_DIALOG_H__
-#include "kz-window.h"
+#include <gtk/gtk.h>
G_BEGIN_DECLS
-void kz_about_dialog_new (KzWindow *kz);
+void kz_about_dialog_new (GtkWindow *parent_window);
G_END_DECLS
Modified: kazehakase/trunk/src/dialogs/kz-copy-format-dialog.c
===================================================================
--- kazehakase/trunk/src/dialogs/kz-copy-format-dialog.c 2007-03-28 00:48:00 UTC (rev 3065)
+++ kazehakase/trunk/src/dialogs/kz-copy-format-dialog.c 2007-03-28 00:51:21 UTC (rev 3066)
@@ -27,10 +27,11 @@
#include "utils.h"
#include "kz-icons.h"
+#include "kazehakase.h"
enum {
PROP_0,
- PROP_KZ_WINDOW
+ PROP_PARENT_WINDOW
};
enum {
@@ -97,11 +98,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));
}
@@ -116,7 +117,7 @@
GtkTreeViewColumn *col;
GtkTreeSelection *selection;
- copy_format->kz = NULL;
+ copy_format->parent_window = NULL;
main_vbox = GTK_DIALOG(copy_format)->vbox;
gtk_box_set_spacing(GTK_BOX(main_vbox), 4);
@@ -227,7 +228,7 @@
gtk_window_set_title(GTK_WINDOW(copy_format), _("Copy Format Editor"));
gtk_window_set_transient_for(GTK_WINDOW(copy_format),
- GTK_WINDOW(copy_format->kz));
+ GTK_WINDOW(copy_format->parent_window));
list = get_copy_format_prefs();
@@ -261,10 +262,10 @@
{
KzCopyFormatDialog *copy_format = KZ_COPY_FORMAT_DIALOG(object);
- if (copy_format->kz)
+ if (copy_format->parent_window)
{
- g_object_unref(copy_format->kz);
- copy_format->kz = NULL;
+ g_object_unref(copy_format->parent_window);
+ copy_format->parent_window = NULL;
}
if (copy_format->list_store)
@@ -288,8 +289,8 @@
switch (prop_id)
{
- case PROP_KZ_WINDOW:
- copy_format->kz = g_object_ref(g_value_get_object(value));
+ case PROP_PARENT_WINDOW:
+ copy_format->parent_window = g_object_ref(g_value_get_object(value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -308,8 +309,8 @@
switch (prop_id)
{
- case PROP_KZ_WINDOW:
- g_value_set_object(value, copy_format->kz);
+ case PROP_PARENT_WINDOW:
+ g_value_set_object(value, copy_format->parent_window);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -319,12 +320,12 @@
GtkWidget *
-kz_copy_format_dialog_new (KzWindow *kz)
+kz_copy_format_dialog_new (GtkWindow *parent_window)
{
GtkWidget *widget;
widget = GTK_WIDGET(g_object_new(KZ_TYPE_COPY_FORMAT_DIALOG,
- "kz-window", kz,
+ "parent-window", parent_window,
NULL));
return widget;
@@ -339,7 +340,7 @@
g_return_if_fail (KZ_IS_COPY_FORMAT_DIALOG(dialog));
copy_format = KZ_COPY_FORMAT_DIALOG(dialog);
- if (!copy_format->kz) return;
+ if (!copy_format->parent_window) return;
switch (arg) {
case GTK_RESPONSE_ACCEPT:
Modified: kazehakase/trunk/src/dialogs/kz-copy-format-dialog.h
===================================================================
--- kazehakase/trunk/src/dialogs/kz-copy-format-dialog.h 2007-03-28 00:48:00 UTC (rev 3065)
+++ kazehakase/trunk/src/dialogs/kz-copy-format-dialog.h 2007-03-28 00:51:21 UTC (rev 3066)
@@ -23,8 +23,6 @@
#include <gtk/gtk.h>
-#include "kz-window.h"
-
G_BEGIN_DECLS
#define KZ_TYPE_COPY_FORMAT_DIALOG (kz_copy_format_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_copy_format_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget *kz_copy_format_dialog_new (KzWindow *kz);
+GtkWidget *kz_copy_format_dialog_new (GtkWindow *parent_window);
G_END_DECLS