aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ephy-nautilus-view.c10
-rwxr-xr-xsrc/statusbar.c11
-rwxr-xr-xsrc/toolbar.c5
3 files changed, 18 insertions, 8 deletions
diff --git a/src/ephy-nautilus-view.c b/src/ephy-nautilus-view.c
index a0e90e52b..56b0edb06 100644
--- a/src/ephy-nautilus-view.c
+++ b/src/ephy-nautilus-view.c
@@ -277,9 +277,9 @@ ephy_nautilus_view_instance_init (EphyNautilusView *view)
p->popup_ui = bonobo_control_get_popup_ui_component (p->control);
g_assert (BONOBO_IS_UI_COMPONENT (p->popup_ui));
- bonobo_ui_util_set_ui (p->popup_ui, DATADIR,
- "nautilus-epiphany-view.xml",
- "EphyNutilusView", NULL);
+ bonobo_ui_util_set_ui (p->popup_ui, SHARE_DIR,
+ "nautilus-epiphany-view.xml",
+ "EphyNautilusView", NULL);
p->popup = ephy_embed_popup_control_new (p->control);
ephy_embed_popup_connect_verbs (EPHY_EMBED_POPUP (p->popup), p->popup_ui);
g_object_set_data (G_OBJECT (p->popup), "NautilisView", view);
@@ -478,8 +478,8 @@ gnv_bonobo_control_activate_cb (BonoboControl *control, gboolean state, EphyNaut
{
EphyNautilusViewPrivate *p = view->priv;
- p->ui = nautilus_view_set_up_ui (NAUTILUS_VIEW (view), DATADIR,
- "nautilus-epiphany-view.xml", "EphyNutilusView");
+ p->ui = nautilus_view_set_up_ui (NAUTILUS_VIEW (view), SHARE_DIR,
+ "nautilus-epiphany-view.xml", "EphyNautilusView");
g_return_if_fail (BONOBO_IS_UI_COMPONENT (p->ui));
ephy_embed_utils_build_charsets_submenu (p->ui,
diff --git a/src/statusbar.c b/src/statusbar.c
index 8ff6b4402..71a97274d 100755
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -18,6 +18,7 @@
#include "statusbar.h"
#include "ephy-stock-icons.h"
+#include "ephy-string.h"
#include <string.h>
#include <time.h>
@@ -196,9 +197,17 @@ void
statusbar_set_message (Statusbar *s,
const char *message)
{
+ char *tmp1, *tmp2;
+
g_return_if_fail (message != NULL);
+ tmp1 = ephy_str_strip_chr (message, '\r');
+ tmp2 = ephy_str_strip_chr (tmp1, '\n');
+
gtk_statusbar_pop (GTK_STATUSBAR (s), 0);
- gtk_statusbar_push (GTK_STATUSBAR (s), 0, message);
+ gtk_statusbar_push (GTK_STATUSBAR (s), 0, tmp2);
+
+ g_free (tmp1);
+ g_free (tmp2);
}
diff --git a/src/toolbar.c b/src/toolbar.c
index abf2477ef..6cebc97e5 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -55,8 +55,9 @@ toolbar_get_property (GObject *object,
GParamSpec *pspec);
static GtkTargetEntry drag_targets[] = {
- { EPHY_DND_TOPIC_TYPE, 0, 0 },
- { EPHY_DND_BOOKMARK_TYPE, 0, 1 },
+ { EGG_TOOLBAR_ITEM_TYPE, 0, 0 },
+ { EPHY_DND_TOPIC_TYPE, 0, 1 },
+ { EPHY_DND_BOOKMARK_TYPE, 0, 2 },
};
static int n_drag_targets = G_N_ELEMENTS (drag_targets);