Aggiustamenti vari.

Su windows va in crash se viene inizializzata CamelSession (per adesso
è disabilitato via preprocessore).

diff --git a/data/libsolipa/gui/libsolipa.ui b/data/libsolipa/gui/libsolipa.ui
index f738f8d6b34ed9f97656dcc828fa8d3b40d80ec7..a0739a293e435ae00b12b66332d9032c195b7fca 100644 (file)
--- a/data/libsolipa/gui/libsolipa.ui
+++ b/data/libsolipa/gui/libsolipa.ui
@@ -176,247 +176,261 @@
             <property name="orientation">vertical</property>
             <property name="spacing">5</property>
             <child>
-              <object class="GtkFrame" id="frame1">
+              <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
-                <property name="label_xalign">0</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment1">
+                  <object class="GtkFrame" id="frame1">
                     <property name="visible">True</property>
-                    <property name="top_padding">5</property>
-                    <property name="bottom_padding">5</property>
-                    <property name="left_padding">5</property>
-                    <property name="right_padding">5</property>
+                    <property name="label_xalign">0</property>
                     <child>
-                      <object class="GtkVBox" id="vbox2">
+                      <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">5</property>
+                        <property name="top_padding">5</property>
+                        <property name="bottom_padding">5</property>
+                        <property name="left_padding">5</property>
+                        <property name="right_padding">5</property>
                         <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow1">
+                          <object class="GtkVBox" id="vbox2">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
-                            <property name="shadow_type">etched-in</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">5</property>
                             <child>
-                              <object class="GtkTreeView" id="treeview1">
+                              <object class="GtkScrolledWindow" id="scrolledwindow1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="model">lstore_treemodel_campi</property>
-                                <property name="headers_clickable">False</property>
-                                <property name="search_column">0</property>
+                                <property name="hscrollbar_policy">automatic</property>
+                                <property name="vscrollbar_policy">automatic</property>
+                                <property name="shadow_type">etched-in</property>
                                 <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                                  <object class="GtkTreeView" id="treeview1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="model">lstore_treemodel_campi</property>
+                                    <property name="headers_clickable">False</property>
+                                    <property name="search_column">0</property>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                                        <child>
+                                          <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
+                                          <attributes>
+                                            <attribute name="active">0</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
                                     <child>
-                                      <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
-                                      <attributes>
-                                        <attribute name="active">0</attribute>
-                                      </attributes>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+                                        <property name="title">Campo</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                                          <attributes>
+                                            <attribute name="text">2</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
                                     </child>
                                   </object>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHButtonBox" id="hbuttonbox1">
+                                <property name="visible">True</property>
+                                <property name="spacing">5</property>
+                                <property name="layout_style">end</property>
                                 <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                                    <property name="title">Campo</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                                      <attributes>
-                                        <attribute name="text">2</attribute>
-                                      </attributes>
-                                    </child>
+                                  <object class="GtkButton" id="button3">
+                                    <property name="label" translatable="yes">Deseleziona tutti</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="button4">
+                                    <property name="label" translatable="yes">Seleziona tutti</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label1">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Seleziona i campi&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame3">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment3">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkHButtonBox" id="hbuttonbox1">
+                          <object class="GtkTable" id="table1">
                             <property name="visible">True</property>
-                            <property name="spacing">5</property>
-                            <property name="layout_style">end</property>
+                            <property name="n_rows">4</property>
+                            <property name="n_columns">2</property>
+                            <property name="column_spacing">5</property>
+                            <property name="row_spacing">5</property>
                             <child>
-                              <object class="GtkButton" id="button3">
-                                <property name="label" translatable="yes">Deseleziona tutti</property>
+                              <object class="GtkLabel" id="label5">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Quotatura</property>
+                              </object>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="entry1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
+                                <property name="invisible_char">&#x25CF;</property>
+                                <property name="text" translatable="yes">"</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label6">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Quotare tutto</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="button4">
-                                <property name="label" translatable="yes">Seleziona tutti</property>
+                              <object class="GtkCheckButton" id="checkbutton1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label7">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Separatore</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="entry2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">&#x25CF;</property>
+                                <property name="text" translatable="yes">,</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label8">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Nomi dei campi come prima riga</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="checkbutton3">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                                <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Seleziona i campi&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkExpander" id="expander1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="use_markup">True</property>
-                <child>
-                  <object class="GtkTable" id="table1">
-                    <property name="visible">True</property>
-                    <property name="n_rows">4</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">5</property>
-                    <property name="row_spacing">5</property>
-                    <child>
+                    <child type="label">
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Quotatura</property>
-                      </object>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="entry1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">&#x25CF;</property>
-                        <property name="text" translatable="yes">"</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label5">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Quotare tutto</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label6">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Separatore</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="entry2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">&#x25CF;</property>
-                        <property name="text" translatable="yes">,</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label7">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Nomi dei campi come prima riga</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Opzioni di esportazione&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
                     </child>
                   </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Opzioni di esportazione&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">1</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -434,10 +448,10 @@
                       <object class="GtkFileChooserWidget" id="filechooserwidget1">
                         <property name="visible">True</property>
                         <property name="orientation">vertical</property>
-                        <property name="local_only">False</property>
                         <property name="use_preview_label">False</property>
-                        <property name="action">save</property>
                         <property name="preview_widget_active">False</property>
+                        <property name="action">save</property>
+                        <property name="local_only">False</property>
                       </object>
                     </child>
                   </object>
@@ -451,7 +465,7 @@
                 </child>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>

diff --git a/src/camelsession.c b/src/camelsession.c
index c3e0b52941a7d10fe28ce24efbb9dc66dbc73d0d..da3892b6b4bab7099b74315d79d437c14346b627 100644 (file)
--- a/src/camelsession.c
+++ b/src/camelsession.c
@@ -20,11 +20,10 @@
        #include <config.h>
 #endif
 
-
 #include "camelsession.h"
 
 static void
-class_init (SolipaCamelSessionClass *solipa_camel_session_class)
+solipa_camel_session_class_init (SolipaCamelSessionClass *solipa_camel_session_class)
 {
        CamelSessionClass *camel_session_class = CAMEL_SESSION_CLASS (solipa_camel_session_class);
 }
@@ -40,7 +39,7 @@ solipa_camel_session_get_type (void)
                        "SolipaCamelSession",
                        sizeof (SolipaCamelSession),
                        sizeof (SolipaCamelSessionClass),
-                       (CamelObjectClassInitFunc) class_init,
+                       (CamelObjectClassInitFunc) solipa_camel_session_class_init,
                        NULL,
                        NULL,
                        NULL);
@@ -49,8 +48,8 @@ solipa_camel_session_get_type (void)
        return type;
 }
 
-CamelSession *
-solipa_camel_session_new (const gchar *path)
+CamelSession
+*solipa_camel_session_new (const gchar *path)
 {
        CamelSession *session;
 

diff --git a/src/camelsession.h b/src/camelsession.h
index d62801642501bb3166372e2360a2450e4c408356..5d5df24b2ce5c04ce100f7a6245cd529d441197c 100644 (file)
--- a/src/camelsession.h
+++ b/src/camelsession.h
@@ -29,19 +29,16 @@ G_BEGIN_DECLS
 #define SOLIPA_CAMEL_SESSION(obj)     (CAMEL_CHECK_CAST((obj), SOLIPA_CAMEL_SESSION_TYPE, SolipaCamelSession))
 #define SOLIPA_CAMEL_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), SOLIPA_CAMEL_SESSION_TYPE, SolipaCamelSessionClass))
 #define SOLIPA_CAMEL_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), SOLIPA_CAMEL_SESSION_TYPE))
-#define SOLIPA_CAMEL_SESSION_IS_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), SOLIPA_CAMEL_SESSION_TYPE))
-#define SOLIPA_CAMEL_SESSION_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), SOLIPA_CAMEL_SESSION_TYPE, SolipaCamelSessionClass))
 
 typedef struct _SolipaCamelSession SolipaCamelSession;
 typedef struct _SolipaCamelSessionClass SolipaCamelSessionClass;
 
-typedef struct _SolipaCamelSession
+struct _SolipaCamelSession
        {
                CamelSession parent_object;
-
        };
 
-typedef struct _SolipaCamelSessionClass
+struct _SolipaCamelSessionClass
        {
                CamelSessionClass parent_class;
        };

diff --git a/src/solipa.c b/src/solipa.c
index 4a6a88e65264583403c288f234af2f4843a85a52..4556771ea880bf495361be3635ad4bb5b2a36ecb 100644 (file)
--- a/src/solipa.c
+++ b/src/solipa.c
@@ -39,7 +39,7 @@ static void solipa_get_property (GObject *object,
                                GValue *value,
                                GParamSpec *pspec);
 
-#define SOLIPA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_SOLIPA, SolipaPrivate))
+#define SOLIPA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), SOLIPA_TYPE, SolipaPrivate))
 
 typedef struct _SolipaPrivate SolipaPrivate;
 struct _SolipaPrivate
@@ -92,6 +92,7 @@ Solipa
        solipa = SOLIPA (g_object_new (solipa_get_type (), NULL));
        priv = SOLIPA_GET_PRIVATE (solipa);
 
+#ifndef G_OS_WIN32
        /* creo la directory temporanea per camel */
        camel_tmpdir = g_mkdtemp (g_build_filename (g_get_tmp_dir (), g_strdup ("solipa-camel-XXXXXX"), NULL));
 
@@ -100,6 +101,7 @@ Solipa
        camel_provider_init ();
 
        priv->camel_session = solipa_camel_session_new (camel_tmpdir);
+#endif
 
        /* gui */
 #ifdef G_OS_WIN32

diff --git a/src/solipa.h b/src/solipa.h
index 3b39886a2fd298bd16e9d9e7860980ef4d5c66c8..63da8368e0d7b7399ca8bd27bb0c49d3dd510c72 100644 (file)
--- a/src/solipa.h
+++ b/src/solipa.h
@@ -32,12 +32,12 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_SOLIPA                 (solipa_get_type ())
-#define SOLIPA(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SOLIPA, Solipa))
-#define SOLIPA_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SOLIPA, SolipaClass))
-#define IS_SOLIPA(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SOLIPA))
-#define IS_SOLIPA_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SOLIPA))
-#define SOLIPA_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SOLIPA, SolipaClass))
+#define SOLIPA_TYPE                 (solipa_get_type ())
+#define SOLIPA(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOLIPA_TYPE, Solipa))
+#define SOLIPA_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), SOLIPA_TYPE, SolipaClass))
+#define IS_SOLIPA(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SOLIPA_TYPE))
+#define IS_SOLIPA_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), SOLIPA_TYPE))
+#define SOLIPA_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), SOLIPA_TYPE, SolipaClass))
 
 typedef struct _Solipa Solipa;
 typedef struct _SolipaClass SolipaClass;

diff --git a/src/utils.c b/src/utils.c
index 6087e4642d0d6793be457fb1b3514fcef2d4d4d1..3cea209e561437894796adbb6b41bdb11d77cff2 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -23,8 +23,7 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include <solipa.h>
-
+#include "solipa.h"
 #include "utils.h"
 
 static void solipa_fixed_toggled (GtkCellRendererToggle *cell,
@@ -255,9 +254,11 @@ solipa_on_btn_unselect_all_clicked (GtkButton *button,
 }
 
 void
-solipa_gtktreemodel_to_csv_gui (Solipa *solipa, GtkTreeModel *model,
-                                 gchar **columns_title,
-                                 guint n_columns)
+solipa_gtktreemodel_to_csv_gui (Solipa *solipa,
+                                GtkWindow *parent,
+                                GtkTreeModel *model,
+                                gchar **columns_title,
+                                guint n_columns)
 {
        GtkWidget *diag;
        GError *error;
@@ -274,6 +275,8 @@ solipa_gtktreemodel_to_csv_gui (Solipa *solipa, GtkTreeModel *model,
        guint *columns;
        guint _n_columns;
 
+       g_return_if_fail (IS_SOLIPA (solipa));
+
        builder = solipa_get_gtkbuilder (solipa);
 
        if (!GTK_IS_BUILDER (builder))
@@ -299,6 +302,10 @@ solipa_gtktreemodel_to_csv_gui (Solipa *solipa, GtkTreeModel *model,
        diag = GTK_WIDGET (gtk_builder_get_object (builder, "diag_gtktreemodel_to_csv"));
        if (GTK_IS_WIDGET (diag))
                {
+                       /* imposto la directory di default alla directory documenti */
+                       gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (gtk_builder_get_object (builder, "filechooserwidget1")),
+                                                            g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
+
                        /* carico i nomi campi per la selezione nel model */
                        store = GTK_LIST_STORE (gtk_builder_get_object (builder, "lstore_treemodel_campi"));
 
@@ -322,6 +329,7 @@ solipa_gtktreemodel_to_csv_gui (Solipa *solipa, GtkTreeModel *model,
                                                            -1);
                                }
 
+                       gtk_window_set_transient_for (GTK_WINDOW (diag), parent);
                        do
                                {
                                        if (gtk_dialog_run (GTK_DIALOG (diag)) == GTK_RESPONSE_OK)

diff --git a/src/utils.h b/src/utils.h
index e73d3073bd1ffe6fac8f84e77e60304b3a0eba43..843b83213f1b2db63d965e00396df471bfc9bb12 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -38,7 +38,9 @@ void solipa_gtktreemodel_to_csv (GtkTreeModel *model, const gchar *filename,
                                  guint *columns,
                                  guint n_columns);
 
-void solipa_gtktreemodel_to_csv_gui (Solipa *solipa, GtkTreeModel *model,
+void solipa_gtktreemodel_to_csv_gui (Solipa *solipa,
+                                 GtkWindow *parent,
+                                 GtkTreeModel *model,
                                  gchar **columns_title,
                                  guint n_columns);
 

diff --git a/tests/utils.c b/tests/utils.c
index 7e64d4d35898389441850ef3043512e8be6d2afd..c7488acfa0643162176ed5f7827a6c8467717e91 100644 (file)
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
                                    columns,
                                    2);
 
-       solipa_gtktreemodel_to_csv_gui (solipa, GTK_TREE_MODEL (model),
+       solipa_gtktreemodel_to_csv_gui (solipa, NULL, GTK_TREE_MODEL (model),
                                        columns_title, 3);
 
        return 0;