diff options
Diffstat (limited to 'addressbook/gui/widgets/e-minicard-view-widget.c')
-rw-r--r-- | addressbook/gui/widgets/e-minicard-view-widget.c | 54 |
1 files changed, 9 insertions, 45 deletions
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 2f58db4882..145c5cecce 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -37,7 +37,6 @@ static void e_minicard_view_widget_size_allocate (GtkWidget *widget, GtkAllocati static void e_minicard_view_widget_realize (GtkWidget *widget); static void selection_change (ESelectionModel *esm, EMinicardViewWidget *widget); -static void column_width_changed (ESelectionModel *esm, double width, EMinicardViewWidget *widget); static ECanvasClass *parent_class = NULL; @@ -46,13 +45,11 @@ enum { ARG_0, ARG_BOOK, ARG_QUERY, - ARG_EDITABLE, - ARG_COLUMN_WIDTH + ARG_EDITABLE }; enum { SELECTION_CHANGE, - COLUMN_WIDTH_CHANGED, LAST_SIGNAL }; @@ -102,8 +99,6 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass) GTK_ARG_READWRITE, ARG_QUERY); gtk_object_add_arg_type ("EMinicardViewWidget::editable", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EDITABLE); - gtk_object_add_arg_type ("EMinicardViewWidget::column_width", GTK_TYPE_INT, - GTK_ARG_READWRITE, ARG_COLUMN_WIDTH); e_minicard_view_widget_signals [SELECTION_CHANGE] = gtk_signal_new ("selection_change", @@ -113,14 +108,6 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass) gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); - e_minicard_view_widget_signals [COLUMN_WIDTH_CHANGED] = - gtk_signal_new ("column_width_changed", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (EMinicardViewWidgetClass, column_width_changed), - e_marshal_NONE__DOUBLE, - GTK_TYPE_NONE, 1, GTK_TYPE_DOUBLE); - gtk_object_class_add_signals (object_class, e_minicard_view_widget_signals, LAST_SIGNAL); object_class->set_arg = e_minicard_view_widget_set_arg; @@ -131,9 +118,6 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass) widget_class->size_allocate = e_minicard_view_widget_size_allocate; canvas_class->reflow = e_minicard_view_widget_reflow; - - klass->selection_change = NULL; - klass->column_width_changed = NULL; } static void @@ -144,7 +128,6 @@ e_minicard_view_widget_init (EMinicardViewWidget *view) view->book = NULL; view->query = NULL; view->editable = FALSE; - view->column_width = 150; } GtkWidget * @@ -190,17 +173,9 @@ e_minicard_view_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) case ARG_EDITABLE: emvw->editable = GTK_VALUE_BOOL(*arg); if (emvw->emv) - gtk_object_set (GTK_OBJECT(emvw->emv), - "editable", emvw->editable, - NULL); - break; - case ARG_COLUMN_WIDTH: - emvw->column_width = GTK_VALUE_INT (*arg); - if (emvw->emv) { - gtk_object_set (GTK_OBJECT(emvw->emv), - "column_width", (int) emvw->column_width, - NULL); - } + gtk_object_set (GTK_OBJECT(emvw->emv), + "editable", emvw->editable, + NULL); break; } } @@ -222,9 +197,6 @@ e_minicard_view_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) case ARG_EDITABLE: GTK_VALUE_BOOL (*arg) = emvw->editable; break; - case ARG_COLUMN_WIDTH: - GTK_VALUE_INT (*arg) = emvw->column_width; - break; default: arg->type = GTK_TYPE_INVALID; break; @@ -260,16 +232,15 @@ e_minicard_view_widget_realize (GtkWidget *widget) e_minicard_view_get_type(), "height", (double) 100, "minimum_width", (double) 100, - "adapter", view->adapter, - "column_width", (int) view->column_width, NULL ); + gtk_object_set(GTK_OBJECT(view->emv), + "adapter", view->adapter, + NULL); + gtk_signal_connect (GTK_OBJECT (E_REFLOW(view->emv)->selection), "selection_changed", selection_change, view); - gtk_signal_connect (GTK_OBJECT (view->emv), - "column_width_changed", - column_width_changed, view); if (GTK_WIDGET_CLASS(parent_class)->realize) GTK_WIDGET_CLASS(parent_class)->realize (widget); @@ -319,14 +290,7 @@ static void selection_change (ESelectionModel *esm, EMinicardViewWidget *widget) { gtk_signal_emit (GTK_OBJECT(widget), - e_minicard_view_widget_signals [SELECTION_CHANGE]); -} - -static void -column_width_changed (ESelectionModel *esm, double width, EMinicardViewWidget *widget) -{ - gtk_signal_emit (GTK_OBJECT(widget), - e_minicard_view_widget_signals [COLUMN_WIDTH_CHANGED], width); + e_minicard_view_widget_signals [SELECTION_CHANGE], widget); } gint |