projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit includes a complete refactor of ModestMsgView. Now
[modest]
/
src
/
widgets
/
modest-combo-box.c
diff --git
a/src/widgets/modest-combo-box.c
b/src/widgets/modest-combo-box.c
index
3e0fc0e
..
8956df8
100644
(file)
--- a/
src/widgets/modest-combo-box.c
+++ b/
src/widgets/modest-combo-box.c
@@
-125,11
+125,11
@@
modest_combo_box_finalize (GObject *obj)
}
static GtkTreeModel*
}
static GtkTreeModel*
-get_model (const ModestPairList *pairs)
+get_model (ModestPairList *pairs)
{
GtkTreeIter iter;
GtkListStore *store;
{
GtkTreeIter iter;
GtkListStore *store;
- const GSList *cursor;
+ GSList *cursor;
store = gtk_list_store_new (2,
G_TYPE_POINTER, /* the id */
store = gtk_list_store_new (2,
G_TYPE_POINTER, /* the id */
@@
-149,7
+149,7
@@
get_model (const ModestPairList *pairs)
GtkWidget*
GtkWidget*
-modest_combo_box_new (const ModestPairList *pairs, GEqualFunc id_equal_func)
+modest_combo_box_new (ModestPairList *pairs, GEqualFunc id_equal_func)
{
GtkTreeModel *model;
GtkCellRenderer *renderer;
{
GtkTreeModel *model;
GtkCellRenderer *renderer;
@@
-168,8
+168,9
@@
modest_combo_box_new (const ModestPairList *pairs, GEqualFunc id_equal_func)
gtk_cell_layout_clear (GTK_CELL_LAYOUT(obj));
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_clear (GTK_CELL_LAYOUT(obj));
renderer = gtk_cell_renderer_text_new ();
+ g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(obj),
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(obj),
- renderer, FALSE);
+ renderer, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT(obj),
renderer, "text",
COLUMN_DISPLAY_NAME, NULL);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT(obj),
renderer, "text",
COLUMN_DISPLAY_NAME, NULL);
@@
-205,15
+206,13
@@
gpointer
modest_combo_box_get_active_id (ModestComboBox *self)
{
GValue val = {0,};
modest_combo_box_get_active_id (ModestComboBox *self)
{
GValue val = {0,};
- gpointer retval;
g_return_val_if_fail (self, NULL);
/* Do not unset the GValue */
get_active (self, &val, COLUMN_ID);
g_return_val_if_fail (self, NULL);
/* Do not unset the GValue */
get_active (self, &val, COLUMN_ID);
- retval = g_value_peek_pointer (&val);
- return retval;
+ return g_value_get_pointer (&val);
}
}
@@
-236,7
+235,7
@@
modest_combo_box_set_active_id (ModestComboBox *self, gpointer id)
do {
gpointer row_id;
gtk_tree_model_get (model, &iter, COLUMN_ID, &row_id, -1);
do {
gpointer row_id;
gtk_tree_model_get (model, &iter, COLUMN_ID, &row_id, -1);
- if ((priv->id_equal_func)(id, row_id) == 0) {
+ if ((priv->id_equal_func)(id, row_id)) {
gtk_combo_box_set_active_iter (GTK_COMBO_BOX(self), &iter);
found = TRUE;
}
gtk_combo_box_set_active_iter (GTK_COMBO_BOX(self), &iter);
found = TRUE;
}
@@
-251,14
+250,14
@@
modest_combo_box_set_active_id (ModestComboBox *self, gpointer id)
const gchar*
modest_combo_box_get_active_display_name (ModestComboBox *self)
{
const gchar*
modest_combo_box_get_active_display_name (ModestComboBox *self)
{
- GValue val = {0,};
- gpointer retval;
+ const GValue val = {0,};
+ const gchar *retval;
g_return_val_if_fail (self, NULL);
/* Do not unset the GValue */
g_return_val_if_fail (self, NULL);
/* Do not unset the GValue */
- get_active (self, &val, COLUMN_DISPLAY_NAME);
- retval = g_value_peek_pointer (&val);
+ get_active (self, (GValue *)&val, COLUMN_DISPLAY_NAME);
+ retval = g_value_get_string (&val);
- return (gchar*) retval;
+ return retval;
}
}