aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-12-14 03:00:24 +0800
committerChristian Persch <chpe@src.gnome.org>2004-12-14 03:00:24 +0800
commit08a1289e48356e9da66ca2a16afa8355d8929cf3 (patch)
treecca6242056d2045cbfaa27ae810f1d12b0dcad57
parent39dad59354eb6d7093c9f95817b5278de9f19982 (diff)
downloadgsoc2013-epiphany-08a1289e48356e9da66ca2a16afa8355d8929cf3.tar
gsoc2013-epiphany-08a1289e48356e9da66ca2a16afa8355d8929cf3.tar.gz
gsoc2013-epiphany-08a1289e48356e9da66ca2a16afa8355d8929cf3.tar.bz2
gsoc2013-epiphany-08a1289e48356e9da66ca2a16afa8355d8929cf3.tar.lz
gsoc2013-epiphany-08a1289e48356e9da66ca2a16afa8355d8929cf3.tar.xz
gsoc2013-epiphany-08a1289e48356e9da66ca2a16afa8355d8929cf3.tar.zst
gsoc2013-epiphany-08a1289e48356e9da66ca2a16afa8355d8929cf3.zip
Make distcheck fix.
2004-12-13 Christian Persch <chpe@cvs.gnome.org> * Makefile.am: Make distcheck fix. * lib/ephy-string.c: * lib/ephy-string.h: Finally remove ephy_string_shorten(). * src/bookmarks/ephy-bookmark-action.c: (create_tool_item), (ephy_bookmark_action_sync_label): * src/bookmarks/ephy-bookmarks-menu.c: (connect_proxy_cb): * src/bookmarks/ephy-favorites-menu.c: (connect_proxy_cb): * src/bookmarks/ephy-topic-action.c: (create_tool_item), (ephy_topic_action_sync_label), (append_bookmarks_menu), (build_topics_menu): * src/ephy-navigation-action.c: (new_history_menu_item): Use gtk_label_set_max_width_chars() and ellipsise the labels.
-rw-r--r--src/bookmarks/ephy-bookmarks-menu.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index 3d8fa466c..dcb5a7eb5 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -25,7 +25,6 @@
#include "ephy-bookmark-action.h"
#include "ephy-shell.h"
#include "ephy-node-common.h"
-#include "ephy-string.h"
#include "ephy-marshal.h"
#include "ephy-gui.h"
#include "ephy-debug.h"
@@ -33,6 +32,8 @@
#include <glib/gprintf.h>
#include <glib/gi18n.h>
#include <gtk/gtkuimanager.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkmenuitem.h>
#include <string.h>
#define EPHY_BOOKMARKS_MENU_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_BOOKMARKS_MENU, EphyBookmarksMenuPrivate))
@@ -129,6 +130,8 @@ connect_proxy_cb (GtkActionGroup *action_group,
GtkLabel *label;
label = (GtkLabel *) ((GtkBin *) proxy)->child;
+
+ gtk_label_set_use_underline (label, FALSE);
gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
gtk_label_set_max_width_chars (label, LABEL_WIDTH_CHARS);
}
@@ -374,19 +377,17 @@ create_submenu (EphyBookmarksMenu *menu,
GtkAction *action;
char verb[FOLDER_VERB_FORMAT_LENGTH];
char apath[strlen (FOLDER_ACCEL_PATH_PREFIX) + FOLDER_VERB_FORMAT_LENGTH];
- const char *tmp;
- char *title, *folder;
+ const char *title;
+ char *folder;
char **folders;
GString *path;
guint phash, fhash;
int i;
- tmp = ephy_node_get_property_string (topic, EPHY_NODE_KEYWORD_PROP_NAME);
- g_return_val_if_fail (tmp != NULL, NULL);
+ title = ephy_node_get_property_string (topic, EPHY_NODE_KEYWORD_PROP_NAME);
+ g_return_val_if_fail (title != NULL, NULL);
- title = ephy_string_double_underscores (tmp);
folders = g_strsplit (title, BOOKMARKS_HIERARCHY_SEP, -1);
- g_free (title);
/* occurs if topic name was "" or BOOKMARKS_HIERARCHY_SEP */
if (folders == NULL || folders[0] == NULL)