summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-file-conflict-dialog.c
AgeCommit message (Collapse)AuthorFilesLines
2018-01-31require GTK+ 3.22 and GLib 2.50monsta1-8/+0
2016-11-22move to GTK+3 (>= 3.14), drop libunique, GTK+2 code, and --with-gtk build ↵lukefromdc1-58/+7
option *Remove GTK_VERSION_CHECK (3, 0, 0) and libunique selectors *Remove GTK2 and libunique specific code. *Leaves selector for specific GTK3 versions. *Remove #DEFINES for vbox/hbox previously required for GTK2 compatability *Keep vbox in caja-spatial-window.c, it is necessary for the desktop to work *spatial-window vbox issue at https://github.com/mate-desktop/caja/issues/591
2016-11-03Improved merge folder dialogZenWalker1-8/+40
based on nautilus commit: https://git.gnome.org/browse/nautilus/commit/?id=b370817 Fixes partially #535
2016-07-06GTK+-3 file-conflict-dialog: use widget properties instead of GtkAlignmentraveit651-0/+16
GtkAlignment has been deprecated since GTK+ 3.14 and the use of halign, valign and margin properties is encouraged. This commit aligns widgets by use of said properties instead of the GtkAlignment widget. taken from: https://git.gnome.org/browse/nautilus/commit/?id=470235f
2016-01-25GTK3: fix deprecated GtkMiscWolfgang Ulbrich1-3/+10
2016-01-22GTK3: fix deprecated GtkStock in libcaja-privateWolfgang Ulbrich1-1/+1
2016-01-21GTK3 file-conflict-dialog: fix size of dialog window if replacing foldersWolfgang Ulbrich1-0/+1
2016-01-13GTK3 file-conflict-dialog: don't use override_fontWolfgang Ulbrich1-18/+14
Set the PangoAttributeList on the GtkLabel instead. and 'don't force a size request on the labels' This is not required anymore in GTK+ 3 taken from: https://git.gnome.org/browse/nautilus/commit/?id=52b8185 https://git.gnome.org/browse/nautilus/commit/?id=b8077a7 https://git.gnome.org/browse/nautilus/commit/?id=1457f53
2016-01-13GTK3 file-conflict-dialog: port to GtkStyleContextWolfgang Ulbrich1-1/+23
taken from: https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=5da941e
2016-01-13conflict-dialog: make the rename entry expand the whole widthWolfgang Ulbrich1-1/+1
taken from: https://git.gnome.org/browse/nautilus/commit/?id=392359d
2016-01-13file-conflict-dialog: Don't use italic fontsWolfgang Ulbrich1-6/+6
It adds nothing and makes the text harder to read. taken from: https://git.gnome.org/browse/nautilus/commit/?id=d064618
2015-10-19GTK3: do not use deprecated gtk_misc_set_alignmentraveit651-0/+13
2015-10-19GTK3: Replace gtk_{v,h}box new with gtk_box_newraveit651-0/+5
- gtk_{v,h}box usage is deprecated since gtk+-3.2.0
2014-12-10libcaja-private: don't leak memoryMonsta1-2/+3
2014-10-03file-conflict-dialog: Alt+S is already used in Skip buttonStefano Karapetsas1-1/+1
2012-12-22[all] silence warnings from GCC 4.6Jasmine Hassan1-4/+1
GCC 4.6 introduced a new warning about variables declared and initialized, but not really used in the function body. Remove all of these occurrences to build cleanly. http://git.gnome.org/browse/nautilus/commit/?id=d4230de8667764e02dbb966b5d806ff78ced2fd5
2012-11-16[all] Don't use gtk_dialog_set_has_separator()Jasmine Hassan1-1/+0
http://git.gnome.org/browse/nautilus/commit/?id=73e2941f9b837d5d0326e6e88caa7a1e3fdcabeb
2012-08-12Fixed incorrect fsf addresses. Closes #28.Steve Zesch1-2/+2
2012-06-16add diff button for text files in file conflict dialogStefano Karapetsas1-0/+67
2011-12-01moving from https://github.com/perberos/mate-desktop-environmentPerberos1-0/+670
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 08:20:55 +0000