diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 11:26:18 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 11:26:18 -0300 |
| commit | 01dfa0016c313f5ec5be0a8b624bac5031ff74a8 (patch) | |
| tree | 6dfcf9c3c4143226d0ef65ce2d139f80f8fcacc1 /extra/gtk2 | |
| parent | 40e1222c1402c0d2aded73b95802f8197d0691a6 (diff) | |
| parent | 9343f37ee7ba1aa98f65272412d331a280890e12 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/epdfview/PKGBUILD
community/gpa/PKGBUILD
community/gtk2hs-cairo/PKGBUILD
community/gtk2hs-glib/PKGBUILD
community/gtk2hs-gtk/PKGBUILD
community/gtk2hs-pango/PKGBUILD
community/lmctl/PKGBUILD
community/mediatomb/PKGBUILD
community/ruby-atk/PKGBUILD
community/ruby-gdkpixbuf2/PKGBUILD
community/ruby-gio2/PKGBUILD
community/ruby-glib2/PKGBUILD
community/ruby-pango/PKGBUILD
core/eglibc/glibc-2.10-bz4781.patch
core/eglibc/glibc-2.10-dont-build-timezone.patch
core/eglibc/glibc-2.12.1-static-shared-getpagesize.patch
core/eglibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
core/eglibc/glibc-2.13-futex.patch
core/eglibc/glibc-__i686.patch
extra/silc-toolkit/PKGBUILD
Diffstat (limited to 'extra/gtk2')
| -rw-r--r-- | extra/gtk2/gtk2-dont-ellipsize-filters.diff | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/extra/gtk2/gtk2-dont-ellipsize-filters.diff b/extra/gtk2/gtk2-dont-ellipsize-filters.diff deleted file mode 100644 index ff8dff6ef..000000000 --- a/extra/gtk2/gtk2-dont-ellipsize-filters.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c -index 2ee7903..37d9e8d 100644 ---- a/gtk/gtkfilechooserdefault.c -+++ b/gtk/gtkfilechooserdefault.c -@@ -2322,23 +2322,9 @@ renderer_editing_canceled_cb (GtkCellRendererText *cell_renderer_text, - static GtkWidget * - filter_create (GtkFileChooserDefault *impl) - { -- GtkCellRenderer *cell; -- GList *cells; -- - impl->filter_combo = gtk_combo_box_text_new (); - gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE); - -- /* Get the combo's text renderer and set ellipsize parameters */ -- cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (impl->filter_combo)); -- g_assert (cells); -- cell = cells->data; -- -- g_object_set (G_OBJECT (cell), -- "ellipsize", PANGO_ELLIPSIZE_END, -- NULL); -- -- g_list_free (cells); -- - g_signal_connect (impl->filter_combo, "changed", - G_CALLBACK (filter_combo_changed), impl); - |