diff options
| author | Michael Biebl <biebl@debian.org> | 2014-09-23 13:59:38 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-09-23 13:59:38 +0000 |
| commit | 8c228317bb4f116e619cdd863528977f616b4322 (patch) | |
| tree | dafa84a3c68049a9143e8092b12976543a11e446 /debian/patches/fix-GtkLabel-size.diff | |
| parent | New upstream release. (diff) | |
| download | zenity-8c228317bb4f116e619cdd863528977f616b4322.tar.gz zenity-8c228317bb4f116e619cdd863528977f616b4322.tar.bz2 zenity-8c228317bb4f116e619cdd863528977f616b4322.zip | |
Drop patches, merged upstream.
Diffstat (limited to 'debian/patches/fix-GtkLabel-size.diff')
| -rw-r--r-- | debian/patches/fix-GtkLabel-size.diff | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/debian/patches/fix-GtkLabel-size.diff b/debian/patches/fix-GtkLabel-size.diff deleted file mode 100644 index d9bb2369..00000000 --- a/debian/patches/fix-GtkLabel-size.diff +++ /dev/null @@ -1,43 +0,0 @@ -Author: Arx Cruz <arxcruz@gnome.org> -Date: Thu May 29 17:51:46 2014 -0300 -Description: Fix the size of GtkLabel width when you have a big text in the dialog. -Origin: https://git.gnome.org/browse/zenity/commit/?id=e5eb127e9779b9a58e53b1a7d268b81284ebd241 -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=670496 -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=673643 -Bug-Debian: https://bugs.debian.org/702295 - -diff --git a/src/msg.c b/src/msg.c -index f5d4dc9..f287f25 100644 ---- a/src/msg.c -+++ b/src/msg.c -@@ -27,7 +27,7 @@ - #include "util.h" - - static void zenity_msg_dialog_response (GtkWidget *widget, int response, gpointer data); -- -+static void zenity_text_size_allocate (GtkWidget *widget, GtkAllocation *allocation, gpointer data); - static void - zenity_msg_construct_question_dialog (GtkWidget *dialog, ZenityMsgData *msg_data, ZenityData *data) - { -@@ -161,6 +161,9 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data) - - if (msg_data->ellipsize) - gtk_label_set_ellipsize (GTK_LABEL(text), PANGO_ALIGN_RIGHT); -+ else -+ g_signal_connect_after (G_OBJECT (text), "size-allocate", -+ G_CALLBACK (zenity_text_size_allocate), data); - - if (msg_data->dialog_icon) - gtk_image_set_from_icon_name (GTK_IMAGE (image), msg_data->dialog_icon, GTK_ICON_SIZE_DIALOG); -@@ -179,6 +182,11 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data) - gtk_main (); - } - -+static void -+zenity_text_size_allocate (GtkWidget *widget, GtkAllocation *allocation, gpointer data) -+{ -+ gtk_widget_set_size_request (widget, allocation->width, -1); -+} - - static void - zenity_msg_dialog_response (GtkWidget *widget, int response, gpointer data) |