summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-file-conflict-dialog.c
AgeCommit message (Collapse)AuthorFilesLines
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