From b2cda1d0c6d44f53f71bad9e256f41188677dfba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 1 Oct 2008 20:56:04 +0000 Subject: Merge revisions 36016:36533 from trunk. svn path=/branches/kill-bonobo/; revision=36534 --- e-util/e-dialog-utils.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'e-util/e-dialog-utils.c') diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 2bb7bc7770..ecf9e7ec1e 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -1,25 +1,24 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-dialog-utils.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * 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 - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * * Authors: - * Michael Meeks - * Ettore Perazzoli + * Michael Meeks + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H -- cgit v1.2.3 From 8e2b445e9dd2ec76be420bfffdf13bbacae14a3e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 27 Dec 2008 15:14:29 +0000 Subject: Define a new interface called EMailReader, which implements operations common to both the main shell window and the message browser. Replaces EMFolderView. Also begin to define EMailBrowser (GtkWindow subclass), which implements EMailReader and replaces EMMessageBrowser. svn path=/branches/kill-bonobo/; revision=36933 --- e-util/e-dialog-utils.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'e-util/e-dialog-utils.c') diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index ecf9e7ec1e..a97d2c936f 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -344,29 +344,29 @@ e_file_dialog_save_folder (const char *title) * no signals connected and is not shown. **/ GtkWidget * -e_file_get_save_filesel (GtkWidget *parent, const char *title, const char *name, GtkFileChooserAction action) +e_file_get_save_filesel (GtkWindow *parent, const char *title, const char *name, GtkFileChooserAction action) { GtkWidget *filesel; char *uri; - filesel = gtk_file_chooser_dialog_new (title, - NULL, - action, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - (action == GTK_FILE_CHOOSER_ACTION_OPEN) ? GTK_STOCK_OPEN:GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL); + + filesel = gtk_file_chooser_dialog_new ( + title, parent, action, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + (action == GTK_FILE_CHOOSER_ACTION_OPEN) ? + GTK_STOCK_OPEN : GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK); gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (filesel), FALSE); - if (parent) - e_dialog_set_transient_for((GtkWindow *)filesel, parent); - - uri = e_file_get_save_path(); + uri = e_file_get_save_path (); - gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (filesel), uri); + gtk_file_chooser_set_current_folder_uri ( + GTK_FILE_CHOOSER (filesel), uri); if (name && name[0]) - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filesel), name); + gtk_file_chooser_set_current_name ( + GTK_FILE_CHOOSER (filesel), name); g_free (uri); -- cgit v1.2.3 From c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 Jan 2009 04:12:01 +0000 Subject: Merge revisions 36866:37046 from trunk. svn path=/branches/kill-bonobo/; revision=37050 --- e-util/e-dialog-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'e-util/e-dialog-utils.c') diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index a97d2c936f..99b5ad9b61 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -27,6 +27,7 @@ #include "e-dialog-utils.h" +#include #include #include @@ -36,7 +37,6 @@ #include #include -#include #include "e-util/e-util.h" #include "e-util/e-error.h" -- cgit v1.2.3 From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- e-util/e-dialog-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'e-util/e-dialog-utils.c') diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 0546430512..978033541a 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -10,7 +10,7 @@ * 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 + * License along with the program; if not, see * * * Authors: -- cgit v1.2.3 From 948235c3d1076dbe6ed2e57a24c16a083bbd9f01 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 27 May 2009 10:29:19 -0400 Subject: Prefer GLib basic types over C types. --- e-util/e-dialog-utils.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'e-util/e-dialog-utils.c') diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 32a16a3b5b..b44cd17e75 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -53,11 +53,11 @@ * button. **/ void -e_notice (gpointer parent, GtkMessageType type, const char *format, ...) +e_notice (gpointer parent, GtkMessageType type, const gchar *format, ...) { GtkWidget *dialog; va_list args; - char *str; + gchar *str; va_start (args, format); str = g_strdup_vprintf (format, args); @@ -87,11 +87,11 @@ e_notice (gpointer parent, GtkMessageType type, const char *format, ...) * window argument. **/ void -e_notice_with_xid (GdkNativeWindow parent, GtkMessageType type, const char *format, ...) +e_notice_with_xid (GdkNativeWindow parent, GtkMessageType type, const gchar *format, ...) { GtkWidget *dialog; va_list args; - char *str; + gchar *str; va_start (args, format); str = g_strdup_vprintf (format, args); @@ -121,9 +121,9 @@ window_is_wm_toplevel (Display *display, Window window) { static Atom WM_STATE = None; unsigned long nitems, after; - unsigned char *data = NULL; + guchar *data = NULL; Atom type = None; - int format; + gint format; if (!WM_STATE) WM_STATE = XInternAtom (display, "WM_STATE", False); @@ -132,7 +132,7 @@ window_is_wm_toplevel (Display *display, Window window) AnyPropertyType, &type, &format, &nitems, &after, &data) == Success) { if (data) - XFree((char*)data); + XFree((gchar *)data); if (type) return TRUE; } @@ -160,7 +160,7 @@ e_dialog_set_transient_for (GtkWindow *dialog, GtkWidget *toplevel; #ifdef GDK_WINDOWING_X11 Window parent, root_ret, *children; - unsigned int numchildren; + guint numchildren; Display *display; Status status; #endif @@ -248,8 +248,8 @@ static void save_ok (GtkWidget *widget, gpointer data) { GtkWidget *fs; - char **filename = data; - char *uri; + gchar **filename = data; + gchar *uri; fs = gtk_widget_get_toplevel (widget); uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fs)); @@ -271,11 +271,11 @@ filechooser_response (GtkWidget *fc, gint response_id, gpointer data) gtk_widget_destroy (fc); } -char * -e_file_dialog_save (const char *title, const char *fname) +gchar * +e_file_dialog_save (const gchar *title, const gchar *fname) { GtkWidget *selection; - char *filename = NULL; + gchar *filename = NULL; selection = e_file_get_save_filesel(NULL, title, fname, GTK_FILE_CHOOSER_ACTION_SAVE); @@ -294,8 +294,8 @@ static void save_folder_ok (GtkWidget *widget, gpointer data) { GtkWidget *fs; - char **filename = data; - char *uri; + gchar **filename = data; + gchar *uri; fs = gtk_widget_get_toplevel (widget); uri = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (fs)); @@ -315,11 +315,11 @@ folderchooser_response (GtkWidget *fc, gint response_id, gpointer data) gtk_widget_destroy (fc); } -char * -e_file_dialog_save_folder (const char *title) +gchar * +e_file_dialog_save_folder (const gchar *title) { GtkWidget *selection; - char *filename = NULL; + gchar *filename = NULL; selection = e_file_get_save_filesel(NULL, title, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); g_signal_connect (G_OBJECT (selection), "response", G_CALLBACK (folderchooser_response), &filename); @@ -344,10 +344,10 @@ e_file_dialog_save_folder (const char *title) * no signals connected and is not shown. **/ GtkWidget * -e_file_get_save_filesel (GtkWindow *parent, const char *title, const char *name, GtkFileChooserAction action) +e_file_get_save_filesel (GtkWindow *parent, const gchar *title, const gchar *name, GtkFileChooserAction action) { GtkWidget *filesel; - char *uri; + gchar *uri; g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL); @@ -382,10 +382,10 @@ e_file_get_save_filesel (GtkWindow *parent, const char *title, const char *name, * it. Returns the users choice. **/ gboolean -e_file_can_save(GtkWindow *parent, const char *uri) +e_file_can_save(GtkWindow *parent, const gchar *uri) { struct stat st; - char *path; + gchar *path; gboolean res; if (!uri || uri[0] == 0) @@ -421,9 +421,9 @@ e_file_can_save(GtkWindow *parent, const char *uri) } gboolean -e_file_check_local (const char *name) +e_file_check_local (const gchar *name) { - char *uri; + gchar *uri; uri = e_util_uri_to_filename (name); if (uri) { -- cgit v1.2.3 From 14f8eee012382f04090ea9277e9567d5f32e8bf0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 28 May 2009 13:06:29 -0400 Subject: Whitespace cleanup. --- e-util/e-dialog-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'e-util/e-dialog-utils.c') diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index b44cd17e75..8740c78054 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -15,7 +15,7 @@ * * Authors: * Michael Meeks - * Ettore Perazzoli + * Ettore Perazzoli * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * -- cgit v1.2.3 From 374bd42f69aca2e132fd854c9619f3d7491f1f96 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 12 Jul 2009 23:33:07 -0400 Subject: Fix excessive whitespace. --- e-util/e-dialog-utils.c | 1 - 1 file changed, 1 deletion(-) (limited to 'e-util/e-dialog-utils.c') diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 8740c78054..ae431ee094 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -242,7 +242,6 @@ e_dialog_set_transient_for_xid (GtkWindow *dialog, gdk_window_set_transient_for (gtk_widget_get_window (GTK_WIDGET (dialog)), parent); } - static void save_ok (GtkWidget *widget, gpointer data) -- cgit v1.2.3 From fa360fde289f9b850191f89059d1a5e6d67c07c7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 18 Jul 2009 14:07:42 -0400 Subject: More whitespace cleanup. --- e-util/e-dialog-utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'e-util/e-dialog-utils.c') diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index ae431ee094..d02a42572b 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -147,7 +147,7 @@ window_is_wm_toplevel (Display *display, Window window) * @parent_widget: the parent for @dialog * * This sets the parent for @dialog to be @parent_widget. Unlike - * gtk_window_set_transient_for(), this doesn't need @parent_widget to + * gtk_window_set_transient_for (), this doesn't need @parent_widget to * be the actual toplevel, and also works if @parent_widget is * embedded as a Bonobo control by an out-of-process container. * @parent_widget must already be realized before calling this @@ -191,7 +191,7 @@ e_dialog_set_transient_for (GtkWindow *dialog, e_dialog_set_transient_for_xid (dialog, parent); #endif #ifdef GDK_WINDOWING_WIN32 - g_warning ("Not implemented on Win32: e_dialog_set_transient_for() for plug windows"); + g_warning ("Not implemented on Win32: e_dialog_set_transient_for () for plug windows"); #endif } @@ -206,7 +206,7 @@ dialog_realized (GtkWindow *dialog, gpointer xid) * @dialog: a dialog window * @xid: the X Window parent * - * Like e_dialog_set_transient_for(), but use an XID to specify the + * Like e_dialog_set_transient_for (), but use an XID to specify the * parent window. **/ void -- cgit v1.2.3