[Goodies-commits] r6975 - in gigolo/trunk: . src
Enrico Troeger
enrico at xfce.org
Sun Mar 22 17:38:00 CET 2009
Author: enrico
Date: 2009-03-22 16:37:59 +0000 (Sun, 22 Mar 2009)
New Revision: 6975
Modified:
gigolo/trunk/ChangeLog
gigolo/trunk/src/bookmarkdialog.c
gigolo/trunk/src/bookmarkdialog.h
gigolo/trunk/src/bookmarkeditdialog.c
gigolo/trunk/src/bookmarkeditdialog.h
gigolo/trunk/src/browsenetworkpanel.c
gigolo/trunk/src/browsenetworkpanel.h
gigolo/trunk/src/window.c
Log:
Pass a GigoloWindow instance as parent argument instead of a GtkWindow instance because we actually require a GigoloWindow.
Modified: gigolo/trunk/ChangeLog
===================================================================
--- gigolo/trunk/ChangeLog 2009-03-22 16:37:55 UTC (rev 6974)
+++ gigolo/trunk/ChangeLog 2009-03-22 16:37:59 UTC (rev 6975)
@@ -1,3 +1,12 @@
+2009-03-22 Enrico Tröger <enrico(at)xfce(dot)org>
+
+ * src/bookmarkdialog.c, src/bookmarkdialog.h, src/bookmarkeditdialog.c,
+ src/bookmarkeditdialog.h, src/browsenetworkpanel.c,
+ src/browsenetworkpanel.h, src/window.c:
+ Pass a GigoloWindow instance as parent argument instead of a
+ GtkWindow instance because we actually require a GigoloWindow.
+
+
2009-03-21 Enrico Tröger <enrico(at)xfce(dot)org>
* src/bookmarkdialog.c, src/bookmarkdialog.h, src/bookmarkeditdialog.c,
Modified: gigolo/trunk/src/bookmarkdialog.c
===================================================================
--- gigolo/trunk/src/bookmarkdialog.c 2009-03-22 16:37:55 UTC (rev 6974)
+++ gigolo/trunk/src/bookmarkdialog.c 2009-03-22 16:37:59 UTC (rev 6975)
@@ -25,11 +25,11 @@
#include "settings.h"
#include "bookmark.h"
+#include "window.h"
+#include "compat.h"
+#include "common.h"
#include "bookmarkdialog.h"
#include "bookmarkeditdialog.h"
-#include "window.h"
-#include "common.h"
-#include "compat.h"
typedef struct _GigoloBookmarkDialogPrivate GigoloBookmarkDialogPrivate;
@@ -38,7 +38,7 @@
struct _GigoloBookmarkDialogPrivate
{
- GtkWindow *parent;
+ GigoloWindow *parent;
GtkWidget *tree;
GtkListStore *store;
@@ -437,7 +437,7 @@
}
-GtkWidget *gigolo_bookmark_dialog_new(GtkWindow *parent)
+GtkWidget *gigolo_bookmark_dialog_new(GigoloWindow *parent)
{
GtkWidget *dialog;
GigoloBookmarkDialogPrivate *priv;
Modified: gigolo/trunk/src/bookmarkdialog.h
===================================================================
--- gigolo/trunk/src/bookmarkdialog.h 2009-03-22 16:37:55 UTC (rev 6974)
+++ gigolo/trunk/src/bookmarkdialog.h 2009-03-22 16:37:59 UTC (rev 6975)
@@ -47,7 +47,7 @@
};
GType gigolo_bookmark_dialog_get_type (void);
-GtkWidget* gigolo_bookmark_dialog_new (GtkWindow *parent);
+GtkWidget* gigolo_bookmark_dialog_new (GigoloWindow *parent);
G_END_DECLS
Modified: gigolo/trunk/src/bookmarkeditdialog.c
===================================================================
--- gigolo/trunk/src/bookmarkeditdialog.c 2009-03-22 16:37:55 UTC (rev 6974)
+++ gigolo/trunk/src/bookmarkeditdialog.c 2009-03-22 16:37:59 UTC (rev 6975)
@@ -42,7 +42,7 @@
struct _GigoloBookmarkEditDialogPrivate
{
- GtkWindow *parent;
+ GigoloWindow *parent;
GtkWidget *table;
@@ -947,7 +947,7 @@
}
-GtkWidget *gigolo_bookmark_edit_dialog_new(GtkWindow *parent, GigoloBookmarkEditDialogMode mode)
+GtkWidget *gigolo_bookmark_edit_dialog_new(GigoloWindow *parent, GigoloBookmarkEditDialogMode mode)
{
GigoloBookmarkEditDialog *dialog = g_object_new(GIGOLO_BOOKMARK_EDIT_DIALOG_TYPE,
"transient-for", parent,
@@ -960,7 +960,7 @@
}
-GtkWidget *gigolo_bookmark_edit_dialog_new_with_bookmark(GtkWindow *parent,
+GtkWidget *gigolo_bookmark_edit_dialog_new_with_bookmark(GigoloWindow *parent,
GigoloBookmarkEditDialogMode mode, GigoloBookmark *bookmark)
{
GigoloBookmarkEditDialog *dialog = g_object_new(GIGOLO_BOOKMARK_EDIT_DIALOG_TYPE,
Modified: gigolo/trunk/src/bookmarkeditdialog.h
===================================================================
--- gigolo/trunk/src/bookmarkeditdialog.h 2009-03-22 16:37:55 UTC (rev 6974)
+++ gigolo/trunk/src/bookmarkeditdialog.h 2009-03-22 16:37:59 UTC (rev 6975)
@@ -55,9 +55,9 @@
};
GType gigolo_bookmark_edit_dialog_get_type (void);
-GtkWidget* gigolo_bookmark_edit_dialog_new (GtkWindow *parent,
+GtkWidget* gigolo_bookmark_edit_dialog_new (GigoloWindow *parent,
GigoloBookmarkEditDialogMode mode);
-GtkWidget* gigolo_bookmark_edit_dialog_new_with_bookmark (GtkWindow *parent,
+GtkWidget* gigolo_bookmark_edit_dialog_new_with_bookmark (GigoloWindow *parent,
GigoloBookmarkEditDialogMode,
GigoloBookmark *bookmark);
gint gigolo_bookmark_edit_dialog_run (GigoloBookmarkEditDialog *dialog);
Modified: gigolo/trunk/src/browsenetworkpanel.c
===================================================================
--- gigolo/trunk/src/browsenetworkpanel.c 2009-03-22 16:37:55 UTC (rev 6974)
+++ gigolo/trunk/src/browsenetworkpanel.c 2009-03-22 16:37:59 UTC (rev 6975)
@@ -41,7 +41,7 @@
struct _GigoloBrowseNetworkPanelPrivate
{
- GtkWindow *parent;
+ GigoloWindow *parent;
GtkWidget *button_refresh;
GtkWidget *button_connect;
@@ -558,7 +558,7 @@
}
-GtkWidget *gigolo_browse_network_panel_new(GtkWindow *parent)
+GtkWidget *gigolo_browse_network_panel_new(GigoloWindow *parent)
{
GtkWidget *self;
GigoloBrowseNetworkPanelPrivate *priv;
Modified: gigolo/trunk/src/browsenetworkpanel.h
===================================================================
--- gigolo/trunk/src/browsenetworkpanel.h 2009-03-22 16:37:55 UTC (rev 6974)
+++ gigolo/trunk/src/browsenetworkpanel.h 2009-03-22 16:37:59 UTC (rev 6975)
@@ -49,7 +49,7 @@
GType gigolo_browse_network_panel_get_type (void);
-GtkWidget* gigolo_browse_network_panel_new (GtkWindow *parent);
+GtkWidget* gigolo_browse_network_panel_new (GigoloWindow *parent);
G_END_DECLS
Modified: gigolo/trunk/src/window.c
===================================================================
--- gigolo/trunk/src/window.c 2009-03-22 16:37:55 UTC (rev 6974)
+++ gigolo/trunk/src/window.c 2009-03-22 16:37:59 UTC (rev 6975)
@@ -332,7 +332,7 @@
GigoloBookmark *bm = NULL;
GtkWidget *dialog;
- dialog = gigolo_bookmark_edit_dialog_new(GTK_WINDOW(window), GIGOLO_BE_MODE_CONNECT);
+ dialog = gigolo_bookmark_edit_dialog_new(window, GIGOLO_BE_MODE_CONNECT);
if (gigolo_bookmark_edit_dialog_run(GIGOLO_BOOKMARK_EDIT_DIALOG(dialog)) == GTK_RESPONSE_OK)
{
bm = gigolo_bookmark_new();
@@ -434,7 +434,7 @@
GtkWidget *dialog;
GigoloWindowPrivate *priv = GIGOLO_WINDOW_GET_PRIVATE(window);
- dialog = gigolo_bookmark_dialog_new(GTK_WINDOW(window));
+ dialog = gigolo_bookmark_dialog_new(window);
gtk_dialog_run(GTK_DIALOG(dialog));
gigolo_settings_write(priv->settings, GIGOLO_SETTINGS_BOOKMARKS);
@@ -915,7 +915,7 @@
/* show the bookmark edit dialog and add the bookmark only if it was
* not cancelled */
edit_dialog = gigolo_bookmark_edit_dialog_new_with_bookmark(
- GTK_WINDOW(window), GIGOLO_BE_MODE_EDIT, bm);
+ window, GIGOLO_BE_MODE_EDIT, bm);
if (gigolo_bookmark_edit_dialog_run(
GIGOLO_BOOKMARK_EDIT_DIALOG(edit_dialog)) == GTK_RESPONSE_OK)
{
@@ -1425,7 +1425,7 @@
panel_pane = gtk_hpaned_new();
gtk_paned_set_position(GTK_PANED(panel_pane), 200);
- priv->browse_panel = gigolo_browse_network_panel_new(GTK_WINDOW(window));
+ priv->browse_panel = gigolo_browse_network_panel_new(window);
gtk_widget_show(priv->browse_panel);
/* Pack the widgets altogether */
More information about the Goodies-commits
mailing list