This commit is contained in:
Matthias Clasen 2008-08-23 01:54:09 +00:00
parent 3d33e50740
commit e8643fd367
3 changed files with 5 additions and 74 deletions

View File

@ -1,23 +0,0 @@
diff -up gedit-2.23.1/configure.ac.python gedit-2.23.1/configure.ac
--- gedit-2.23.1/configure.ac.python 2008-05-12 11:32:44.000000000 -0400
+++ gedit-2.23.1/configure.ac 2008-08-09 22:35:22.000000000 -0400
@@ -203,10 +203,6 @@ if test "x$have_python" != "xno"; then
fi
if test "x$have_python" != "xno"; then
- AM_CHECK_PYTHON_HEADERS([],[have_python=no])
-fi
-
-if test "x$have_python" != "xno"; then
PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
PYTHON_LIBS="-lpython$PYTHON_VERSION"
@@ -329,8 +325,6 @@ dnl ====================================
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
-GNOME_COMPILE_WARNINGS(yes)
-
AC_ARG_ENABLE(deprecations,
[AC_HELP_STRING([--enable-deprecations],
[warn about deprecated usages [default=no]])],,

View File

@ -17,7 +17,7 @@
Summary: gEdit is a small but powerful text editor for GNOME
Name: gedit
Version: 2.23.3
Version: 2.23.90
Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@ -109,7 +109,7 @@ autoreconf
%configure \
--disable-scrollkeeper \
--disable-gtk-doc \
--enable-python
--enable-python
make
%install
@ -189,6 +189,9 @@ fi
%changelog
* Fri Aug 22 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.23.90-1
- Update to 2.23.90
* Wed Aug 13 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.23.3-2
- Finally drop the vendor prefix, since it broke things again

View File

@ -1,49 +0,0 @@
diff -up gedit-2.23.1/plugins/filebrowser/gedit-file-bookmarks-store.c.icon-names gedit-2.23.1/plugins/filebrowser/gedit-file-bookmarks-store.c
--- gedit-2.23.1/plugins/filebrowser/gedit-file-bookmarks-store.c.icon-names 2008-07-09 23:44:16.000000000 -0400
+++ gedit-2.23.1/plugins/filebrowser/gedit-file-bookmarks-store.c 2008-07-09 23:46:42.000000000 -0400
@@ -140,9 +140,9 @@ add_file (GeditFileBookmarksStore * mode
}
if (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_HOME)
- pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("gnome-fs-home", GTK_ICON_SIZE_MENU);
+ pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("user-home", GTK_ICON_SIZE_MENU);
else if (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_DESKTOP)
- pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("gnome-fs-desktop", GTK_ICON_SIZE_MENU);
+ pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("user-desktop", GTK_ICON_SIZE_MENU);
else if (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_ROOT)
pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("drive-harddisk", GTK_ICON_SIZE_MENU);
@@ -348,7 +348,7 @@ add_bookmark (GeditFileBookmarksStore *
-1);
if (!pixbuf) {
- pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("gnome-fs-directory", GTK_ICON_SIZE_MENU);
+ pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("folder", GTK_ICON_SIZE_MENU);
if (pixbuf) {
gtk_tree_store_set (GTK_TREE_STORE (model),
diff -up gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c.icon-names gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c
--- gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c.icon-names 2008-07-09 23:44:32.000000000 -0400
+++ gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c 2008-07-09 23:47:11.000000000 -0400
@@ -1995,7 +1995,7 @@ model_add_node_from_dir (GeditFileBrowse
}
if (node->icon == NULL) {
- node->icon = gedit_file_browser_utils_pixbuf_from_theme ("gnome-fs-directory", GTK_ICON_SIZE_MENU);
+ node->icon = gedit_file_browser_utils_pixbuf_from_theme ("folder", GTK_ICON_SIZE_MENU);
}
model_add_node (model, node, parent);
Index: gedit-2.23.1/plugins/filebrowser/gedit-file-browser-plugin.c
===================================================================
--- gedit-2.23.1/plugins/filebrowser/gedit-file-browser-plugin.c (revision 6372)
+++ gedit-2.23.1/plugins/filebrowser/gedit-file-browser-plugin.c (working copy)
@@ -723,7 +723,7 @@
window);
panel = gedit_window_get_side_panel (window);
- pixbuf = gedit_file_browser_utils_pixbuf_from_theme("file-manager",
+ pixbuf = gedit_file_browser_utils_pixbuf_from_theme("system-file-manager",
GTK_ICON_SIZE_MENU);
if (pixbuf) {