diff options
Diffstat (limited to 'widgets/menus')
-rw-r--r-- | widgets/menus/gal-define-views-dialog.c | 18 | ||||
-rw-r--r-- | widgets/menus/gal-define-views-model.c | 7 | ||||
-rw-r--r-- | widgets/menus/gal-view-collection.c | 24 | ||||
-rw-r--r-- | widgets/menus/gal-view-etable.c | 4 | ||||
-rw-r--r-- | widgets/menus/gal-view-factory-etable.c | 4 | ||||
-rw-r--r-- | widgets/menus/gal-view-factory.c | 4 | ||||
-rw-r--r-- | widgets/menus/gal-view-instance-save-as-dialog.c | 19 | ||||
-rw-r--r-- | widgets/menus/gal-view-instance.c | 33 | ||||
-rw-r--r-- | widgets/menus/gal-view-new-dialog.c | 21 | ||||
-rw-r--r-- | widgets/menus/gal-view.c | 4 |
10 files changed, 93 insertions, 45 deletions
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index a535c79601..43edcef690 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -23,14 +23,16 @@ #include <config.h> -#include "gal-define-views-dialog.h" - #include <gtk/gtk.h> + +#include "gal/e-table/e-table-scrolled.h" +#include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" +#include "gal/util/e-util-private.h" + +#include "gal-define-views-dialog.h" #include "gal-define-views-model.h" #include "gal-view-new-dialog.h" -#include <gal/e-table/e-table-scrolled.h> -#include <gal/util/e-i18n.h> -#include <gal/util/e-util.h> static void gal_define_views_dialog_init (GalDefineViewsDialog *card); static void gal_define_views_dialog_class_init (GalDefineViewsDialogClass *klass); @@ -242,10 +244,14 @@ gal_define_views_dialog_init (GalDefineViewsDialog *dialog) GladeXML *gui; GtkWidget *widget; GtkWidget *etable; + gchar *filename = g_build_filename (GAL_GLADEDIR, + "gal-define-views.glade", + NULL); dialog->collection = NULL; - gui = glade_xml_new (GAL_GLADEDIR "/gal-define-views.glade", NULL, E_I18N_DOMAIN); + gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); + g_free (filename); dialog->gui = gui; widget = glade_xml_get_widget(gui, "table-top"); diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c index 40e54a53b6..318992cc56 100644 --- a/widgets/menus/gal-define-views-model.c +++ b/widgets/menus/gal-define-views-model.c @@ -22,12 +22,15 @@ */ #include <config.h> + #include <libxml/tree.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> + +#include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" + #include "gal-define-views-model.h" -#include <gal/util/e-i18n.h> -#include <gal/util/e-util.h> #define PARENT_TYPE E_TABLE_MODEL_TYPE static ETableModelClass *parent_class; diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index 5e97419270..826951b9e3 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -23,16 +23,19 @@ #include <config.h> -#include <util/e-i18n.h> -#include <sys/stat.h> #include <ctype.h> #include <string.h> #include <errno.h> + +#include <glib.h> #include <libxml/parser.h> #include <libgnome/gnome-util.h> -#include <gal/util/e-util.h> -#include <gal/util/e-xml-utils.h> -#include <gal/widgets/e-unicode.h> + +#include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" +#include "gal/util/e-xml-utils.h" +#include "gal/widgets/e-unicode.h" + #include "gal-view-collection.h" #define PARENT_TYPE G_TYPE_OBJECT @@ -392,10 +395,17 @@ load_single_dir (GalViewCollection *collection, xmlNode *child; char *filename = g_concat_dir_and_file(dir, "galview.xml"); char *default_view; - struct stat st; - if (stat (filename, &st) != -1 && S_ISREG (st.st_mode)) + if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) { +#ifdef G_OS_WIN32 + gchar *locale_filename = gnome_win32_locale_filename_from_utf8 (filename); + if (locale_filename != NULL) + doc = xmlParseFile (locale_filename); + g_free (locale_filename); +#else doc = xmlParseFile (filename); +#endif + } if (!doc) { g_free (filename); diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c index a46368559e..3f23981fe7 100644 --- a/widgets/menus/gal-view-etable.c +++ b/widgets/menus/gal-view-etable.c @@ -22,8 +22,10 @@ */ #include <config.h> + +#include "gal/e-table/e-table-config.h" + #include "gal-view-etable.h" -#include <gal/e-table/e-table-config.h> #define PARENT_TYPE GAL_VIEW_TYPE diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c index c0d68fe006..3de27833ec 100644 --- a/widgets/menus/gal-view-factory-etable.c +++ b/widgets/menus/gal-view-factory-etable.c @@ -22,10 +22,12 @@ */ #include <config.h> + #include "gal/util/e-i18n.h" #include "gal/util/e-util.h" -#include "gal-view-factory-etable.h" + #include "gal-view-etable.h" +#include "gal-view-factory-etable.h" #define PARENT_TYPE GAL_VIEW_FACTORY_TYPE diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c index 5bc2c9f11d..3a644606f6 100644 --- a/widgets/menus/gal-view-factory.c +++ b/widgets/menus/gal-view-factory.c @@ -22,9 +22,11 @@ */ #include <config.h> -#include "gal-view-factory.h" + #include "gal/util/e-util.h" +#include "gal-view-factory.h" + #define PARENT_TYPE G_TYPE_OBJECT #define d(x) diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index b65d4acba2..d2ce6e9ac3 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -23,16 +23,15 @@ #include <config.h> -#include "gal-view-instance-save-as-dialog.h" +#include <gtk/gtk.h> + +#include "gal/e-table/e-table-scrolled.h" +#include "gal/util/e-i18n.h" +#include "gal/util/e-util-private.h" #include "gal-define-views-model.h" +#include "gal-view-instance-save-as-dialog.h" #include "gal-view-new-dialog.h" -#include <gal/e-table/e-table-scrolled.h> -#include <gal/util/e-i18n.h> -#include <gtk/gtkentry.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkstock.h> static GtkDialogClass *parent_class = NULL; #define PARENT_TYPE GTK_TYPE_DIALOG @@ -192,10 +191,14 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog) GladeXML *gui; GtkWidget *widget; GtkWidget *table; + gchar *filename = g_build_filename (GAL_GLADEDIR, + "gal-view-instance-save-as-dialog.glade", + NULL); dialog->instance = NULL; - gui = glade_xml_new_with_domain (GAL_GLADEDIR "/gal-view-instance-save-as-dialog.glade", NULL, E_I18N_DOMAIN); + gui = glade_xml_new_with_domain (filename , NULL, E_I18N_DOMAIN); + g_free (filename); dialog->gui = gui; widget = glade_xml_get_widget(gui, "vbox-top"); diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index 6ce8a2ab86..5cc3c696a3 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -23,21 +23,25 @@ #include <config.h> -#include <util/e-i18n.h> #include <ctype.h> #include <string.h> #include <errno.h> +#include <unistd.h> +#include <sys/stat.h> + +#include <gtk/gtk.h> #include <libxml/parser.h> #include <libgnome/gnome-util.h> -#include <gal/util/e-util.h> -#include <gal/util/e-xml-utils.h> -#include <gal/widgets/e-unicode.h> +#include <glib/gstdio.h> + +#include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" +#include "gal/util/e-xml-utils.h" +#include "gal/widgets/e-unicode.h" + +#include "gal-define-views-dialog.h" #include "gal-view-instance.h" #include "gal-view-instance-save-as-dialog.h" -#include "gal-define-views-dialog.h" -#include <sys/stat.h> -#include <unistd.h> -#include <gtk/gtkcheckmenuitem.h> #define PARENT_TYPE G_TYPE_OBJECT @@ -242,10 +246,17 @@ load_current_view (GalViewInstance *instance) xmlDoc *doc = NULL; xmlNode *root; GalView *view = NULL; - struct stat st; - if (stat (instance->current_view_filename, &st) != -1 && S_ISREG (st.st_mode)) + if (g_file_test (instance->current_view_filename, G_FILE_TEST_IS_REGULAR)) { +#ifdef G_OS_WIN32 + gchar *locale_filename = gnome_win32_locale_filename_from_utf8 (instance->current_view_filename); + if (locale_filename != NULL) + doc = xmlParseFile(locale_filename); + g_free (locale_filename); +#else doc = xmlParseFile(instance->current_view_filename); +#endif + } if (doc == NULL) { instance->current_id = g_strdup (gal_view_instance_get_default_view (instance)); @@ -454,7 +465,7 @@ gal_view_instance_exists (GalViewInstance *instance) { struct stat st; - if (instance->current_view_filename && stat (instance->current_view_filename, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) + if (instance->current_view_filename && g_stat (instance->current_view_filename, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) return TRUE; else return FALSE; diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index 00ef874e40..7de74c69a8 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -22,14 +22,17 @@ */ #include <config.h> + #include <gtk/gtk.h> -#include <gtk/gtktreeselection.h> -#include "gal-view-new-dialog.h" + +#include "gal/e-table/e-table-scrolled.h" +#include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" +#include "gal/util/e-util-private.h" +#include "gal/widgets/e-unicode.h" + #include "gal-define-views-model.h" -#include <gal/widgets/e-unicode.h> -#include <gal/e-table/e-table-scrolled.h> -#include <gal/util/e-i18n.h> -#include <gal/util/e-util.h> +#include "gal-view-new-dialog.h" static void gal_view_new_dialog_init (GalViewNewDialog *card); static void gal_view_new_dialog_class_init (GalViewNewDialogClass *klass); @@ -85,8 +88,12 @@ gal_view_new_dialog_init (GalViewNewDialog *dialog) { GladeXML *gui; GtkWidget *widget; + gchar *filename = g_build_filename (GAL_GLADEDIR, + "gal-view-new-dialog.glade", + NULL); - gui = glade_xml_new (GAL_GLADEDIR "/gal-view-new-dialog.glade", NULL, E_I18N_DOMAIN); + gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); + g_free (filename); dialog->gui = gui; widget = glade_xml_get_widget(gui, "table-top"); diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c index fa1402fae4..c375b4323f 100644 --- a/widgets/menus/gal-view.c +++ b/widgets/menus/gal-view.c @@ -22,9 +22,11 @@ */ #include <config.h> -#include "gal-view.h" + #include "gal/util/e-util.h" +#include "gal-view.h" + #define PARENT_TYPE G_TYPE_OBJECT #define d(x) |