diff --git a/ChangeLog b/ChangeLog
index 147c30ad8d49a52fd85a25ff4dec0f983b7e34db..890a8b1494fdec638bd350a7ecbcf843a2db8092 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-04 Benedikt Meurer <benny@xfce.org>
+
+ * thunar/thunar-progress-dialog.c: Use Pango attribute list instead of
+ markup for the dialog action label. This fixes bug #1252.
+ * thunar-uca/thunar-uca-chooser.c(thunar_uca_chooser_init): Be sure to
+ create the button widgets prior to connecting the "selection-changed"
+ handler. This fixes bug #1260.
+
2005-12-03 Benedikt Meurer <benny@xfce.org>
* thunar/, po/POTFILES.in, po/*.po: Rename "Favourites" to "Shortcuts",
diff --git a/thunar-uca/thunar-uca-chooser.c b/thunar-uca/thunar-uca-chooser.c
index 8a6d00d8d61507dcbc86d26a5a3a0d3319f451eb..5600104212dc92bec912f6f286952c2855e4b5fb 100644
--- a/thunar-uca/thunar-uca-chooser.c
+++ b/thunar-uca/thunar-uca-chooser.c
@@ -163,10 +163,6 @@ thunar_uca_chooser_init (ThunarUcaChooser *uca_chooser)
g_signal_connect_swapped (G_OBJECT (uca_chooser->treeview), "row-activated", G_CALLBACK (thunar_uca_chooser_edit_clicked), uca_chooser);
gtk_widget_show (uca_chooser->treeview);
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (uca_chooser->treeview));
- gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
- g_signal_connect_swapped (G_OBJECT (selection), "changed", G_CALLBACK (thunar_uca_chooser_selection_changed), uca_chooser);
-
uca_model = thunar_uca_model_get_default ();
gtk_tree_view_set_model (GTK_TREE_VIEW (uca_chooser->treeview), GTK_TREE_MODEL (uca_model));
g_object_unref (G_OBJECT (uca_model));
@@ -237,6 +233,12 @@ thunar_uca_chooser_init (ThunarUcaChooser *uca_chooser)
image = gtk_image_new_from_stock (GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (uca_chooser->down_button), image);
gtk_widget_show (image);
+
+ /* configure the tree view selection after the buttons have been created */
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (uca_chooser->treeview));
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+ g_signal_connect_swapped (G_OBJECT (selection), "changed", G_CALLBACK (thunar_uca_chooser_selection_changed), uca_chooser);
+ thunar_uca_chooser_selection_changed (uca_chooser, selection);
}
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index 1c06f0c2c0d91dd9d92a09e56151a439b11e3bfb..44e79879862d74b55cde4d8741fd45c718c490e3 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -121,17 +121,6 @@ thunar_progress_dialog_get_type (void)
-static gboolean
-transform_to_markup (const GValue *src_value,
- GValue *dst_value,
- gpointer user_data)
-{
- g_value_take_string (dst_value, g_strdup_printf ("<big>%s</big>", g_value_get_string (src_value)));
- return TRUE;
-}
-
-
-
static void
thunar_progress_dialog_class_init (ThunarProgressDialogClass *klass)
{
@@ -169,17 +158,19 @@ thunar_progress_dialog_class_init (ThunarProgressDialogClass *klass)
static void
thunar_progress_dialog_init (ThunarProgressDialog *dialog)
{
- GtkWidget *table;
- GtkWidget *image;
- GtkWidget *label;
+ PangoAttribute *attribute;
+ PangoAttrList *attr_list_big;
+ GtkWidget *table;
+ GtkWidget *image;
+ GtkWidget *label;
/* remember the current time as start time */
g_get_current_time (&dialog->start_time);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
gtk_window_set_default_size (GTK_WINDOW (dialog), 350, -1);
+ gtk_window_set_title (GTK_WINDOW (dialog), "");
table = g_object_new (GTK_TYPE_TABLE,
"border-width", 6,
@@ -195,10 +186,18 @@ thunar_progress_dialog_init (ThunarProgressDialog *dialog)
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 6);
gtk_widget_show (image);
- label = g_object_new (GTK_TYPE_LABEL, "use-markup", TRUE, "xalign", 0.0f, NULL);
+ label = g_object_new (GTK_TYPE_LABEL, "xalign", 0.0f, NULL);
gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 6);
gtk_widget_show (label);
+ attr_list_big = pango_attr_list_new ();
+ attribute = pango_attr_scale_new (PANGO_SCALE_LARGE);
+ attribute->start_index = 0;
+ attribute->end_index = -1;
+ pango_attr_list_insert (attr_list_big, attribute);
+ gtk_label_set_attributes (GTK_LABEL (label), attr_list_big);
+ pango_attr_list_unref (attr_list_big);
+
dialog->progress_label = g_object_new (EXO_TYPE_ELLIPSIZED_LABEL, "ellipsize", EXO_PANGO_ELLIPSIZE_START, "xalign", 0.0f, NULL);
gtk_table_attach (GTK_TABLE (table), dialog->progress_label, 0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (dialog->progress_label);
@@ -212,9 +211,8 @@ thunar_progress_dialog_init (ThunarProgressDialog *dialog)
G_OBJECT (image), "icon-name");
/* connect the window title to the action label */
- exo_binding_new_full (G_OBJECT (dialog), "title",
- G_OBJECT (label), "label",
- transform_to_markup, NULL, NULL);
+ exo_binding_new (G_OBJECT (dialog), "title",
+ G_OBJECT (label), "label");
}