drop unused patches

This commit is contained in:
Matthias Clasen 2010-03-29 12:59:25 +00:00
parent 6b88b35554
commit bc8baab004
3 changed files with 0 additions and 121 deletions

View File

@ -1,19 +0,0 @@
diff -up gedit-2.29.8/configure.ac.libm gedit-2.29.8/configure.ac
--- gedit-2.29.8/configure.ac.libm 2010-03-01 15:12:45.000000000 -0500
+++ gedit-2.29.8/configure.ac 2010-03-02 18:53:13.191648202 -0500
@@ -45,6 +45,7 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
GTK_DOC_CHECK([1.0],[--flavour=no-tmpl])
AC_CHECK_FUNCS(fsync)
AC_CHECK_FUNC(sigaction)
+AC_CHECK_LIB(m, floor)
dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
@@ -253,6 +254,7 @@ PKG_CHECK_MODULES(GEDIT, [
gtk+-2.0 >= 2.16.0
gtksourceview-2.0 >= 2.9.7
gconf-2.0 >= 1.1.11
+ x11
])
dnl FIXME: Remove this when removing gedit-message-area

View File

@ -1,84 +0,0 @@
diff -up gedit-2.27.4/plugins/docinfo/docinfo.ui.button-images gedit-2.27.4/plugins/docinfo/docinfo.ui
--- gedit-2.27.4/plugins/docinfo/docinfo.ui.button-images 2009-08-22 21:24:45.878430797 -0400
+++ gedit-2.27.4/plugins/docinfo/docinfo.ui 2009-08-22 21:26:27.996679948 -0400
@@ -1,6 +1,10 @@
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<interface>
+ <object class="GtkImage" id="update_image">
+ <property name="stock">gtk-refresh</property>
+ <property name="icon_size">4</property>
+ </object>
<object class="GtkDialog" id="dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">Document Statistics</property>
@@ -44,66 +48,9 @@
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
- <child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-refresh</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label29">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Update</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">update_image</property>
+ <property name="label" translatable="yes">_Update</property>
+ <property name="use_underline">True</property>
</object>
</child>
</object>

View File

@ -1,18 +0,0 @@
diff -up gedit-2.29.8/gedit/gedit-io-error-message-area.c.missing-message gedit-2.29.8/gedit/gedit-io-error-message-area.c
--- gedit-2.29.8/gedit/gedit-io-error-message-area.c.missing-message 2010-03-08 13:59:23.179942638 -0500
+++ gedit-2.29.8/gedit/gedit-io-error-message-area.c 2010-03-08 13:58:32.470689390 -0500
@@ -635,10 +635,14 @@ gedit_io_loading_error_message_area_new
if (is_gio_error (error, G_IO_ERROR_TOO_MANY_LINKS))
{
+ error_message = g_strdup_printf (_("There was a problem opening the file %s."),
+ uri_for_display);
message_details = g_strdup (_("The number of followed links is limited and the actual file could not be found within this limit."));
}
else if (is_gio_error (error, G_IO_ERROR_PERMISSION_DENIED))
{
+ error_message = g_strdup_printf (_("There was a problem opening the file %s."),
+ uri_for_display);
message_details = g_strdup (_("You do not have the permissions necessary to open the file."));
}
else if ((is_gio_error (error, G_IO_ERROR_INVALID_DATA) && encoding == NULL) ||