rpms/gnome-terminal/devel gnome-terminal-2.14.1-real-transparency.patch, 1.3, 1.4 gnome-terminal.spec, 1.45, 1.46
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 25 20:18:24 UTC 2006
Author: krh
Update of /cvs/dist/rpms/gnome-terminal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25776
Modified Files:
gnome-terminal-2.14.1-real-transparency.patch
gnome-terminal.spec
Log Message:
* Tue Apr 25 2006 Kristian Høgsberg <krh at redhat.com> - 2.14.1-10
- Fix selection atom name intialization (patch from Kjartan Maaras).
gnome-terminal-2.14.1-real-transparency.patch:
terminal-screen.c | 22 ++++++++++++++++------
terminal-screen.h | 2 ++
terminal-widget-vte.c | 9 +++++++++
terminal-widget.h | 3 +++
terminal-window.c | 41 +++++++++++++++++++++++++++++++++++++++++
terminal-window.h | 2 ++
terminal.c | 2 ++
7 files changed, 75 insertions(+), 6 deletions(-)
Index: gnome-terminal-2.14.1-real-transparency.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal-2.14.1-real-transparency.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-terminal-2.14.1-real-transparency.patch 18 Apr 2006 05:22:51 -0000 1.3
+++ gnome-terminal-2.14.1-real-transparency.patch 25 Apr 2006 20:18:03 -0000 1.4
@@ -1,5 +1,5 @@
---- ./src/terminal-screen.c.real-transparency 2006-04-18 00:29:10.000000000 -0400
-+++ ./src/terminal-screen.c 2006-04-18 00:29:10.000000000 -0400
+--- ./src/terminal-screen.c.real-transparency 2006-04-25 15:02:21.000000000 -0400
++++ ./src/terminal-screen.c 2006-04-25 15:02:21.000000000 -0400
@@ -119,8 +119,6 @@
static void terminal_screen_setup_dnd (TerminalScreen *screen);
@@ -69,7 +69,7 @@
if (screen->priv->profile)
g_signal_emit (G_OBJECT (screen), signals[PROFILE_SET], 0);
--- ./src/terminal-screen.h.real-transparency 2006-01-20 13:05:42.000000000 -0500
-+++ ./src/terminal-screen.h 2006-04-18 00:29:10.000000000 -0400
++++ ./src/terminal-screen.h 2006-04-25 15:02:21.000000000 -0400
@@ -74,6 +74,8 @@
TerminalProfile *profile);
TerminalProfile* terminal_screen_get_profile (TerminalScreen *screen);
@@ -80,7 +80,7 @@
char **argv);
const char** terminal_screen_get_override_command (TerminalScreen *screen);
--- ./src/terminal-widget-vte.c.real-transparency 2006-01-20 13:05:42.000000000 -0500
-+++ ./src/terminal-widget-vte.c 2006-04-18 00:29:10.000000000 -0400
++++ ./src/terminal-widget-vte.c 2006-04-25 15:02:21.000000000 -0400
@@ -351,6 +351,7 @@
terminal_widget_set_background_transparent (GtkWidget *widget,
gboolean setting)
@@ -105,7 +105,7 @@
gboolean setting)
{
--- ./src/terminal-widget.h.real-transparency 2006-01-20 13:05:43.000000000 -0500
-+++ ./src/terminal-widget.h 2006-04-18 00:29:10.000000000 -0400
++++ ./src/terminal-widget.h 2006-04-25 15:02:21.000000000 -0400
@@ -90,6 +90,9 @@
/* 0.0 = normal bg, 1.0 = all black bg, 0.5 = half darkened */
void terminal_widget_set_background_darkness (GtkWidget *widget,
@@ -117,7 +117,7 @@
gboolean setting);
void terminal_widget_set_normal_gdk_font (GtkWidget *widget,
--- ./src/terminal-window.c.real-transparency 2006-03-04 01:21:01.000000000 -0500
-+++ ./src/terminal-window.c 2006-04-18 00:58:59.000000000 -0400
++++ ./src/terminal-window.c 2006-04-25 16:13:42.000000000 -0400
@@ -85,6 +85,9 @@
* event-driven while GTK doesn't support _NET_WM_STATE_FULLSCREEN
*/
@@ -128,7 +128,7 @@
};
enum {
-@@ -750,6 +753,47 @@
+@@ -750,6 +753,42 @@
}
static void
@@ -137,22 +137,17 @@
+ GdkScreen *screen;
+ GdkColormap *colormap;
+ char *atom_name;
-+ Display *display;
-+ GdkDisplay *gdk_display;
-+ int atom;
++ GdkAtom atom;
+
-+ gdk_display = gtk_widget_get_display (GTK_WIDGET (window));
-+ display = gdk_x11_display_get_xdisplay (gdk_display);
++ screen = gtk_widget_get_screen (GTK_WIDGET (window));
+
+ atom_name = g_strdup_printf ("_NET_WM_CM_S%d",
+ gdk_screen_get_number (screen));
-+ atom = gdk_x11_get_xatom_by_name (atom_name);
++ atom = gdk_atom_intern (atom_name, FALSE);
+ g_free (atom_name);
-+
-+ screen = gtk_widget_get_screen (GTK_WIDGET (window));
-+ colormap = gdk_screen_get_rgba_colormap (screen);
+
-+ if (colormap != NULL && XGetSelectionOwner (display, atom) != None)
++ colormap = gdk_screen_get_rgba_colormap (screen);
++ if (colormap != NULL && gdk_selection_owner_get (atom) != None)
+ {
+ /* Set RGBA colormap if possible so VTE can use real alpha
+ * channels for transparency. */
@@ -176,7 +171,7 @@
terminal_window_init (TerminalWindow *window)
{
GtkWidget *mi;
-@@ -781,6 +825,8 @@
+@@ -781,6 +820,8 @@
window->priv->use_mnemonics = TRUE;
window->priv->using_mnemonics = FALSE;
@@ -185,17 +180,8 @@
/* force gtk to construct its GtkClipboard; otherwise our UI is very slow the first time we need it */
window->priv->clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (window)), GDK_NONE);
-@@ -1233,6 +1279,8 @@
- void terminal_window_realized_callback (GtkWidget *window,
- gpointer user_data)
- {
-+ TerminalWindow *terminal_window = (TerminalWindow *) window;
-+
- gdk_window_set_group (window->window, window->window);
- g_signal_handlers_disconnect_by_func (window, terminal_window_realized_callback, NULL);
- }
--- ./src/terminal-window.h.real-transparency 2005-11-20 10:06:34.000000000 -0500
-+++ ./src/terminal-window.h 2006-04-18 00:29:10.000000000 -0400
++++ ./src/terminal-window.h 2006-04-25 15:02:21.000000000 -0400
@@ -98,6 +98,8 @@
void terminal_window_set_startup_id (TerminalWindow *window,
const char *startup_id);
@@ -206,7 +192,7 @@
#endif /* TERMINAL_WINDOW_H */
--- ./src/terminal.c.real-transparency 2006-03-04 01:10:54.000000000 -0500
-+++ ./src/terminal.c 2006-04-18 00:29:10.000000000 -0400
++++ ./src/terminal.c 2006-04-25 15:02:21.000000000 -0400
@@ -1966,6 +1966,8 @@
terminal_window_add_screen (window, screen);
Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnome-terminal.spec 19 Apr 2006 14:50:40 -0000 1.45
+++ gnome-terminal.spec 25 Apr 2006 20:18:08 -0000 1.46
@@ -13,7 +13,7 @@
Summary: GNOME Terminal
Name: gnome-terminal
Version: 2.14.1
-Release: 9
+Release: 10
URL: http://www.gnome.org/
Source0: gnome-terminal-%{version}.tar.bz2
Source1: ne.po
@@ -103,6 +103,9 @@
%{_libdir}/bonobo
%changelog
+* Tue Apr 25 2006 Kristian Høgsberg <krh at redhat.com> - 2.14.1-10
+- Fix selection atom name intialization (patch from Kjartan Maaras).
+
* Wed Apr 19 2006 Ray Strode <rstrode at redhat.com> 2.14.1-9
- Require newer vte (bug 189341)
More information about the fedora-cvs-commits
mailing list