summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ad628d1)
* src/prefs_toolbar.c
Fix crash when no actions exist
+2007-07-09 [colin] 2.10.0cvs10
+
+ * src/prefs_toolbar.c
+ Fix crash when no actions exist
+
2007-07-07 [paul] 2.10.0cvs9
* COPYING
2007-07-07 [paul] 2.10.0cvs9
* COPYING
( cvs diff -u -r 1.8.2.20 -r 1.8.2.21 src/quote_fmt.c; ) > 2.10.0cvs7.patchset
( cvs diff -u -r 1.9.2.24 -r 1.9.2.25 src/plugins/clamav/clamav_plugin_gtk.c; ) > 2.10.0cvs8.patchset
( cvs diff -u -r 1.5.10.5 -r 1.5.10.6 COPYING; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/claws-mail-manual.xml; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 po/fi.po; ) > 2.10.0cvs9.patchset
( cvs diff -u -r 1.8.2.20 -r 1.8.2.21 src/quote_fmt.c; ) > 2.10.0cvs7.patchset
( cvs diff -u -r 1.9.2.24 -r 1.9.2.25 src/plugins/clamav/clamav_plugin_gtk.c; ) > 2.10.0cvs8.patchset
( cvs diff -u -r 1.5.10.5 -r 1.5.10.6 COPYING; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/claws-mail-manual.xml; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 po/fi.po; ) > 2.10.0cvs9.patchset
+( cvs diff -u -r 1.30.2.33 -r 1.30.2.34 src/prefs_toolbar.c; ) > 2.10.0cvs10.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
static void get_action_name(const gchar *entry, gchar **menu)
{
gchar *act, *act_p;
static void get_action_name(const gchar *entry, gchar **menu)
{
gchar *act, *act_p;
if (prefs_common.actions_list != NULL) {
if (prefs_common.actions_list != NULL) {
gchar *syl_act = toolbar_ret_descr_from_val(A_SYL_ACTIONS);
GtkListStore *store_set;
GtkTreeIter iter;
gchar *syl_act = toolbar_ret_descr_from_val(A_SYL_ACTIONS);
GtkListStore *store_set;
GtkTreeIter iter;
/* move selection in icon list view to set list view */
/* move selection in icon list view to set list view */
text = gtk_editable_get_chars
(GTK_EDITABLE(prefs_toolbar->entry_icon_text), 0, -1);
text = gtk_editable_get_chars
(GTK_EDITABLE(prefs_toolbar->entry_icon_text), 0, -1);
- gtk_list_store_append(store_set, &iter);
- gtk_list_store_set(store_set, &iter,
- SET_ICON, pixbuf,
- SET_FILENAME, fname,
- SET_TEXT, text,
- SET_EVENT, event,
- SET_ICON_TEXT, NULL,
- SET_ICON_IS_TEXT, FALSE,
- -1);
+ if (text != NULL) {
+ gtk_list_store_append(store_set, &iter);
+ gtk_list_store_set(store_set, &iter,
+ SET_ICON, pixbuf,
+ SET_FILENAME, fname,
+ SET_TEXT, text,
+ SET_EVENT, event,
+ SET_ICON_TEXT, NULL,
+ SET_ICON_IS_TEXT, FALSE,
+ -1);
+ }
g_free(text);
g_free(event);
}
g_free(text);
g_free(event);
}
- gtk_list_store_set(store_set, &iter_set,
- SET_ICON, pixbuf,
- SET_FILENAME, icon_fname,
- SET_TEXT, text,
- SET_EVENT, icon_event,
- SET_ICON_TEXT, NULL,
- SET_ICON_IS_TEXT, FALSE,
- -1);
-
+ if (text != NULL) {
+ gtk_list_store_set(store_set, &iter_set,
+ SET_ICON, pixbuf,
+ SET_FILENAME, icon_fname,
+ SET_TEXT, text,
+ SET_EVENT, icon_event,
+ SET_ICON_TEXT, NULL,
+ SET_ICON_IS_TEXT, FALSE,
+ -1);
+ }
g_free(icon_event);
g_free(set_event);
g_free(text);
g_free(icon_event);
g_free(set_event);
g_free(text);