aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--embed/ephy-embed-utils.c2
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp2
-rwxr-xr-xsrc/pdm-dialog.c27
-rw-r--r--src/window-commands.c4
5 files changed, 41 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b2a7ef81c..ef0fe5d8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-03-16 Marco Pesenti Gritti <marco@it.gnome.org>
+
+ * embed/ephy-embed-utils.c: (ephy_embed_utils_save):
+ * embed/mozilla/mozilla-embed-single.cpp:
+ * src/pdm-dialog.c: (group_button_allocations), (pdm_dialog_init):
+ * src/window-commands.c: (window_cmd_file_open):
+
+ Cleanup filepicker api behavior.
+ Put pdm buttons in a size group, to make switching page smoother.
+ (from galeon)
+
2003-03-15 Xan Lopez <xan@masilla.org>
* src/bookmarks/ephy-node-view.c
diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c
index eda05cd64..33a8935ad 100644
--- a/embed/ephy-embed-utils.c
+++ b/embed/ephy-embed-utils.c
@@ -160,13 +160,13 @@ ephy_embed_utils_save (GtkWidget *window,
g_free (retDir);
gnome_vfs_uri_unref (uri);
+ g_free (retPath);
}
g_object_unref (G_OBJECT(persist));
g_free (dirName);
g_free (fileName);
- g_free (retPath);
}
static void
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index fe1fbd1f0..20ccdfdca 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -945,8 +945,6 @@ impl_show_file_picker (EphyEmbedSingle *shell,
}
else
{
- if (*ret_fullpath)
- g_free (*ret_fullpath);
nsCOMPtr<nsILocalFile> file;
filePicker->GetFile (getter_AddRefs(file));
nsCAutoString tempFullPathStr;
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index fc0a102f0..a108cae88 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -471,6 +471,31 @@ pdm_dialog_passwords_free (PdmActionInfo *info,
ephy_embed_single_free_passwords (single, l);
}
+/* Group all Properties and Remove buttons in the same size group to avoid the
+ * little jerk you get otherwise when switching pages because one set of
+ * buttons is wider than another. */
+static void
+group_button_allocations (EphyDialog *dialog)
+{
+ const gint props[] =
+ {
+ PROP_COOKIES_REMOVE,
+ PROP_COOKIES_PROPERTIES,
+ PROP_PASSWORDS_REMOVE
+ };
+ GtkSizeGroup *size_group;
+ guint i;
+
+ size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+ for (i = 0; i < G_N_ELEMENTS (props); ++i)
+ {
+ GtkWidget *w;
+ w = ephy_dialog_get_control (dialog, props[i]);
+ gtk_size_group_add_widget (size_group, w);
+ }
+}
+
static void
pdm_dialog_init (PdmDialog *dialog)
{
@@ -492,6 +517,8 @@ pdm_dialog_init (PdmDialog *dialog)
"epiphany.glade",
"pdm_dialog");
+ group_button_allocations (EPHY_DIALOG (dialog));
+
cookies_tv = setup_cookies_treeview (dialog);
passwords_tv = setup_passwords_treeview (dialog);
diff --git a/src/window-commands.c b/src/window-commands.c
index c217b3bd4..bc793234d 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -287,7 +287,7 @@ window_cmd_file_open (EggAction *action,
EphyWindow *window)
{
gchar *dir, *retDir;
- gchar *file = NULL;
+ gchar *file;
GnomeVFSURI *uri;
GtkWidget *wmain;
EphyEmbedShell *embed_shell;
@@ -327,10 +327,10 @@ window_cmd_file_open (EggAction *action,
g_free (retDir);
gnome_vfs_uri_unref (uri);
}
+ g_free (file);
}
g_free (dir);
- g_free (file);
}
void