aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/egg/egg-action.c11
-rw-r--r--lib/egg/egg-menu-merge.c4
-rw-r--r--lib/ephy-dnd.c50
-rw-r--r--lib/ephy-dnd.h1
-rw-r--r--lib/ephy-string.c3
-rwxr-xr-xlib/widgets/ephy-editable-toolbar.c51
6 files changed, 90 insertions, 30 deletions
diff --git a/lib/egg/egg-action.c b/lib/egg/egg-action.c
index 360ba358e..89886b575 100644
--- a/lib/egg/egg-action.c
+++ b/lib/egg/egg-action.c
@@ -560,11 +560,14 @@ disconnect_proxy (EggAction *action, GtkWidget *proxy)
G_CALLBACK (egg_action_sync_stock_id), proxy);
/* menu item specific synchronisers ... */
- g_signal_handlers_disconnect_by_func (action,
- G_CALLBACK (egg_action_sync_label),
- proxy);
+ if (GTK_IS_MENU_ITEM (proxy))
+ {
+ g_signal_handlers_disconnect_by_func (action,
+ G_CALLBACK (egg_action_sync_label),
+ proxy);
- gtk_menu_item_set_accel_path (GTK_MENU_ITEM (proxy), NULL);
+ gtk_menu_item_set_accel_path (GTK_MENU_ITEM (proxy), NULL);
+ }
/* toolbar button specific synchronisers ... */
g_signal_handlers_disconnect_by_func (action,
diff --git a/lib/egg/egg-menu-merge.c b/lib/egg/egg-menu-merge.c
index 3bdd73156..bacc34dde 100644
--- a/lib/egg/egg-menu-merge.c
+++ b/lib/egg/egg-menu-merge.c
@@ -992,8 +992,8 @@ update_node (EggMenuMerge *self, GNode *node)
goto recurse_children;
}
- if (info->action)
- g_object_unref (info->action);
+/* if (info->action)
+ g_object_unref (info->action);*/
info->action = action;
/* if (info->action)
g_object_ref (info->action);*/
diff --git a/lib/ephy-dnd.c b/lib/ephy-dnd.c
index 03fa83544..99438495c 100644
--- a/lib/ephy-dnd.c
+++ b/lib/ephy-dnd.c
@@ -20,6 +20,7 @@
#include <gtk/gtkselection.h>
#include <gtk/gtktreeview.h>
+#include <string.h>
static GtkTargetEntry url_drag_types [] =
{
@@ -108,3 +109,52 @@ ephy_dnd_enable_model_drag_source (GtkWidget *treeview)
GDK_ACTION_COPY);
}
+GList *
+ephy_dnd_uri_list_extract_uris (const char *uri_list)
+{
+ /* Note that this is mostly very stolen from old libgnome/gnome-mime.c */
+
+ const gchar *p, *q;
+ gchar *retval;
+ GList *result = NULL;
+
+ g_return_val_if_fail (uri_list != NULL, NULL);
+
+ p = uri_list;
+
+ /* We don't actually try to validate the URI according to RFC
+ * 2396, or even check for allowed characters - we just ignore
+ * comments and trim whitespace off the ends. We also
+ * allow LF delimination as well as the specified CRLF.
+ */
+ while (p != NULL) {
+ if (*p != '#') {
+ while (g_ascii_isspace (*p))
+ p++;
+
+ q = p;
+ while ((*q != '\0')
+ && (*q != '\n')
+ && (*q != '\r'))
+ q++;
+
+ if (q > p) {
+ q--;
+ while (q > p
+ && g_ascii_isspace (*q))
+ q--;
+
+ retval = g_malloc (q - p + 2);
+ strncpy (retval, p, q - p + 1);
+ retval[q - p + 1] = '\0';
+
+ result = g_list_prepend (result, retval);
+ }
+ }
+ p = strchr (p, '\n');
+ if (p != NULL)
+ p++;
+ }
+
+ return g_list_reverse (result);
+}
diff --git a/lib/ephy-dnd.h b/lib/ephy-dnd.h
index 7d5281128..e888977a8 100644
--- a/lib/ephy-dnd.h
+++ b/lib/ephy-dnd.h
@@ -59,6 +59,7 @@ void ephy_dnd_url_drag_source_set (GtkWidget *widget);
void ephy_dnd_enable_model_drag_source (GtkWidget *treeview);
+GList *ephy_dnd_uri_list_extract_uris (const char *uri_list);
G_END_DECLS
diff --git a/lib/ephy-string.c b/lib/ephy-string.c
index ca32e824c..46ea0194f 100644
--- a/lib/ephy-string.c
+++ b/lib/ephy-string.c
@@ -156,9 +156,6 @@ ephy_str_to_int (const char *string, gulong *integer)
if ((result == G_MINLONG || result == G_MAXLONG) && errno == ERANGE) {
return FALSE;
}
- if (result < G_MININT || result > G_MAXINT) {
- return FALSE;
- }
/* Check that all the trailing characters are spaces. */
while (*parse_end != '\0') {
diff --git a/lib/widgets/ephy-editable-toolbar.c b/lib/widgets/ephy-editable-toolbar.c
index b082d6c31..8ab1a1904 100755
--- a/lib/widgets/ephy-editable-toolbar.c
+++ b/lib/widgets/ephy-editable-toolbar.c
@@ -88,7 +88,6 @@ typedef struct
{
gboolean separator;
EggAction *action;
- char *type;
} ItemNode;
GType
@@ -132,14 +131,13 @@ toolbar_node_new (void)
}
static ItemNode *
-item_node_new (EggAction *action, const char *type, gboolean separator)
+item_node_new (EggAction *action, gboolean separator)
{
ItemNode *item;
item = g_new0 (ItemNode, 1);
item->action = action;
item->separator = separator;
- item->type = type ? g_strdup (type) : NULL;
return item;
}
@@ -188,8 +186,6 @@ impl_get_action (EphyEditableToolbar *etoolbar,
{
EggAction *action;
- LOG ("Getting an action");
-
if (type == NULL)
{
action = find_action (etoolbar, name);
@@ -218,9 +214,10 @@ add_action (EphyEditableToolbar *t,
if (!separator)
{
action = ephy_editable_toolbar_get_action (t, type, name);
+ g_return_if_fail (action != NULL);
}
- item = item_node_new (action, type, separator);
+ item = item_node_new (action, separator);
node = g_node_new (item);
g_node_insert_before (parent, sibling, node);
@@ -236,14 +233,11 @@ parse_item_list (EphyEditableToolbar *t,
if (xmlStrEqual (child->name, "toolitem"))
{
xmlChar *verb;
- xmlChar *type;
verb = xmlGetProp (child, "verb");
- type = xmlGetProp (child, "type");
- add_action (t, parent, NULL, type, verb);
+ add_action (t, parent, NULL, NULL, verb);
xmlFree (verb);
- xmlFree (type);
}
else if (xmlStrEqual (child->name, "separator"))
{
@@ -367,10 +361,6 @@ toolbar_list_to_xml (EphyEditableToolbar *t, GNode *tl)
{
node = xmlNewChild (tnode, NULL, "toolitem", NULL);
xmlSetProp (node, "verb", item->action->name);
- if (item->type)
- {
- xmlSetProp (node, "type", item->type);
- }
}
}
}
@@ -628,6 +618,17 @@ ensure_toolbars_min_size (EphyEditableToolbar *t)
}
static void
+ephy_editable_toolbar_save (EphyEditableToolbar *t)
+{
+ xmlDocPtr doc;
+
+ doc = toolbar_list_to_xml (t, t->priv->toolbars);
+ xmlSaveFormatFile (t->priv->filename, doc, 1);
+ xmlFreeDoc (doc);
+}
+
+
+static void
do_merge (EphyEditableToolbar *t)
{
char *str;
@@ -656,6 +657,8 @@ do_merge (EphyEditableToolbar *t)
ensure_toolbars_min_size (t);
+ ephy_editable_toolbar_save (t);
+
g_free (str);
}
@@ -740,13 +743,9 @@ ephy_editable_toolbar_init (EphyEditableToolbar *t)
}
static void
-ephy_editable_toolbar_save (EphyEditableToolbar *t)
+free_node (GNode *node)
{
- xmlDocPtr doc;
-
- doc = toolbar_list_to_xml (t, t->priv->toolbars);
- xmlSaveFormatFile (t->priv->filename, doc, 1);
- xmlFreeDoc (doc);
+ g_free (node->data);
}
static void
@@ -757,7 +756,17 @@ ephy_editable_toolbar_finalize (GObject *object)
g_return_if_fail (object != NULL);
g_return_if_fail (IS_EPHY_EDITABLE_TOOLBAR (object));
- ephy_editable_toolbar_save (t);
+ if (t->priv->editor)
+ {
+ gtk_widget_destroy (t->priv->editor);
+ }
+
+ g_node_children_foreach (t->priv->available_actions, G_IN_ORDER,
+ (GNodeForeachFunc)free_node, NULL);
+ g_node_children_foreach (t->priv->toolbars, G_IN_ORDER,
+ (GNodeForeachFunc)free_node, NULL);
+ g_node_destroy (t->priv->available_actions);
+ g_node_destroy (t->priv->toolbars);
g_free (t->priv->filename);
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-07 04:24:51 +0800