rpms/gnome-terminal/devel gnome-terminal-2.14.1-real-transparency.patch, 1.1, 1.2 gnome-terminal.spec, 1.40, 1.41
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Apr 17 21:09:48 UTC 2006
Author: krh
Update of /cvs/dist/rpms/gnome-terminal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25398
Modified Files:
gnome-terminal-2.14.1-real-transparency.patch
gnome-terminal.spec
Log Message:
* Mon Apr 17 2006 Kristian Høgsberg <krh at redhat.com> 2.14.1-5
- Fix gnome-terminal-2.14.1-real-transparency.patch to check for
window->priv != NULL before dereferencing.
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 | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++
terminal-window.h | 2
terminal.c | 2
7 files changed, 169 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-terminal-2.14.1-real-transparency.patch 13 Apr 2006 19:13:44 -0000 1.1
+++ gnome-terminal-2.14.1-real-transparency.patch 17 Apr 2006 21:09:31 -0000 1.2
@@ -1,36 +1,6 @@
-? help/bg/Makefile
-? help/bg/Makefile.in
-? help/bg/gnome-terminal-bg.omf.out
-? help/bg/omf_timestamp
-? help/uk/Makefile
-? help/uk/Makefile.in
-? help/uk/gnome-terminal-uk.omf.out
-? help/uk/omf_timestamp
-? po/.intltool-merge-cache
-? src/.deps
-? src/.libs
-? src/skey/.deps
-? src/skey/.libs
-? src/skey/btoe.lo
-? src/skey/libskey.la
-? src/skey/md4.lo
-? src/skey/md5.lo
-? src/skey/sha1.lo
-? src/skey/skey.lo
-? src/skey/skeyutil.lo
-Index: src/profile-editor.c
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/profile-editor.c,v
-retrieving revision 1.57
-diff -u -p -b -r1.57 profile-editor.c
-Index: src/terminal-screen.c
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal-screen.c,v
-retrieving revision 1.123
-diff -u -p -b -r1.123 terminal-screen.c
---- src/terminal-screen.c 2 Apr 2006 12:29:45 -0000 1.123
-+++ src/terminal-screen.c 13 Apr 2006 18:01:03 -0000
-@@ -119,8 +119,6 @@ static void terminal_screen_widget_encod
+--- ./src/terminal-screen.c.real-transparency 2006-04-17 16:57:41.000000000 -0400
++++ ./src/terminal-screen.c 2006-04-17 16:57:41.000000000 -0400
+@@ -119,8 +119,6 @@
static void terminal_screen_setup_dnd (TerminalScreen *screen);
@@ -39,7 +9,7 @@
static gboolean cook_title (TerminalScreen *screen, const char *raw_title, char **old_cooked_title);
static void terminal_screen_cook_title (TerminalScreen *screen);
-@@ -521,12 +519,13 @@ terminal_screen_get_icon_title_set (Term
+@@ -521,12 +519,13 @@
return screen->priv->icon_title_set;
}
@@ -55,7 +25,7 @@
profile = screen->priv->profile;
-@@ -600,13 +599,24 @@ reread_profile (TerminalScreen *screen)
+@@ -600,13 +599,24 @@
if (bg_type == TERMINAL_BACKGROUND_IMAGE ||
bg_type == TERMINAL_BACKGROUND_TRANSPARENT)
@@ -80,7 +50,7 @@
terminal_widget_set_backspace_binding (term,
terminal_profile_get_backspace_binding (profile));
-@@ -698,7 +708,7 @@ profile_changed_callback (TerminalProfil
+@@ -698,7 +708,7 @@
const TerminalSettingMask *mask,
TerminalScreen *screen)
{
@@ -89,7 +59,7 @@
}
static void
-@@ -946,7 +956,7 @@ terminal_screen_set_profile (TerminalScr
+@@ -946,7 +956,7 @@
screen->priv->profile = profile;
@@ -98,14 +68,9 @@
if (screen->priv->profile)
g_signal_emit (G_OBJECT (screen), signals[PROFILE_SET], 0);
-Index: src/terminal-screen.h
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal-screen.h,v
-retrieving revision 1.14
-diff -u -p -b -r1.14 terminal-screen.h
---- src/terminal-screen.h 20 Jan 2006 18:05:42 -0000 1.14
-+++ src/terminal-screen.h 13 Apr 2006 18:01:03 -0000
-@@ -74,6 +74,8 @@ void terminal_screen_set_profile (Termin
+--- ./src/terminal-screen.h.real-transparency 2006-01-20 13:05:42.000000000 -0500
++++ ./src/terminal-screen.h 2006-04-17 16:57:41.000000000 -0400
+@@ -74,6 +74,8 @@
TerminalProfile *profile);
TerminalProfile* terminal_screen_get_profile (TerminalScreen *screen);
@@ -114,14 +79,9 @@
void terminal_screen_set_override_command (TerminalScreen *screen,
char **argv);
const char** terminal_screen_get_override_command (TerminalScreen *screen);
-Index: src/terminal-widget-vte.c
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal-widget-vte.c,v
-retrieving revision 1.36
-diff -u -p -b -r1.36 terminal-widget-vte.c
---- src/terminal-widget-vte.c 20 Jan 2006 18:05:42 -0000 1.36
-+++ src/terminal-widget-vte.c 13 Apr 2006 18:01:03 -0000
-@@ -351,6 +351,7 @@ void
+--- ./src/terminal-widget-vte.c.real-transparency 2006-01-20 13:05:42.000000000 -0500
++++ ./src/terminal-widget-vte.c 2006-04-17 16:57:41.000000000 -0400
+@@ -351,6 +351,7 @@
terminal_widget_set_background_transparent (GtkWidget *widget,
gboolean setting)
{
@@ -129,29 +89,24 @@
vte_terminal_set_background_transparent(VTE_TERMINAL(widget), setting);
}
-@@ -361,6 +362,14 @@ terminal_widget_set_background_darkness
- {
- g_return_if_fail(VTE_IS_TERMINAL(widget));
- vte_terminal_set_background_saturation(VTE_TERMINAL(widget), 1.0 - factor);
-+}
-+
-+void
+@@ -364,6 +365,14 @@
+ }
+
+ void
+terminal_widget_set_background_opacity (GtkWidget *widget,
+ double factor)
+{
+ g_return_if_fail(VTE_IS_TERMINAL(widget));
+ vte_terminal_set_opacity(VTE_TERMINAL(widget), factor * 0xffff);
- }
-
- void
-Index: src/terminal-widget.h
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal-widget.h,v
-retrieving revision 1.12
-diff -u -p -b -r1.12 terminal-widget.h
---- src/terminal-widget.h 20 Jan 2006 18:05:43 -0000 1.12
-+++ src/terminal-widget.h 13 Apr 2006 18:01:03 -0000
-@@ -90,6 +90,9 @@ void terminal_widget_set_backgroun
++}
++
++void
+ terminal_widget_set_background_scrolls (GtkWidget *widget,
+ gboolean setting)
+ {
+--- ./src/terminal-widget.h.real-transparency 2006-01-20 13:05:43.000000000 -0500
++++ ./src/terminal-widget.h 2006-04-17 16:57:41.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,
double factor);
@@ -161,13 +116,8 @@
void terminal_widget_set_background_scrolls (GtkWidget *widget,
gboolean setting);
void terminal_widget_set_normal_gdk_font (GtkWidget *widget,
-Index: src/terminal-window.c
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal-window.c,v
-retrieving revision 1.126
-diff -u -p -b -r1.126 terminal-window.c
---- src/terminal-window.c 1 Apr 2006 20:03:58 -0000 1.126
-+++ src/terminal-window.c 13 Apr 2006 18:01:03 -0000
+--- ./src/terminal-window.c.real-transparency 2006-03-04 01:21:01.000000000 -0500
++++ ./src/terminal-window.c 2006-04-17 17:05:20.000000000 -0400
@@ -35,6 +35,11 @@
#include <gdk/gdkkeysyms.h>
#include <libsn/sn-launchee.h>
@@ -180,7 +130,7 @@
struct _TerminalWindowPrivate
{
GtkWidget *main_vbox;
-@@ -85,6 +90,12 @@ struct _TerminalWindowPrivate
+@@ -85,6 +90,12 @@
* event-driven while GTK doesn't support _NET_WM_STATE_FULLSCREEN
*/
guint fullscreen : 1;
@@ -193,7 +143,7 @@
};
enum {
-@@ -749,6 +760,115 @@ edit_menu_activate_callback (GtkMenuItem
+@@ -749,6 +760,116 @@
gtk_clipboard_request_text (window->priv->clipboard, (GtkClipboardTextReceivedFunc) update_edit_menu, window);
}
@@ -209,7 +159,8 @@
+ (XFixesSelectionNotifyEvent *) xevent;
+ GList *tmp;
+
-+ if (selection_notify->type != window->priv->selection_notify_event ||
++ if (window->priv == NULL ||
++ selection_notify->type != window->priv->selection_notify_event ||
+ selection_notify->selection != window->priv->cm_selection_atom)
+ return GDK_FILTER_CONTINUE;
+
@@ -309,7 +260,7 @@
static void
terminal_window_init (TerminalWindow *window)
{
-@@ -781,6 +901,8 @@ terminal_window_init (TerminalWindow *wi
+@@ -781,6 +902,8 @@
window->priv->use_mnemonics = TRUE;
window->priv->using_mnemonics = FALSE;
@@ -318,7 +269,7 @@
/* 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,8 +1355,20 @@ terminal_window_show (GtkWidget *widget)
+@@ -1233,8 +1356,20 @@
void terminal_window_realized_callback (GtkWidget *window,
gpointer user_data)
{
@@ -339,14 +290,9 @@
}
TerminalWindow*
-Index: src/terminal-window.h
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal-window.h,v
-retrieving revision 1.11
-diff -u -p -b -r1.11 terminal-window.h
---- src/terminal-window.h 20 Nov 2005 15:06:34 -0000 1.11
-+++ src/terminal-window.h 13 Apr 2006 18:01:03 -0000
-@@ -98,6 +98,8 @@ void terminal_window_reread_profile_list
+--- ./src/terminal-window.h.real-transparency 2005-11-20 10:06:34.000000000 -0500
++++ ./src/terminal-window.h 2006-04-17 16:57:41.000000000 -0400
+@@ -98,6 +98,8 @@
void terminal_window_set_startup_id (TerminalWindow *window,
const char *startup_id);
@@ -355,14 +301,9 @@
G_END_DECLS
#endif /* TERMINAL_WINDOW_H */
-Index: src/terminal.c
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal.c,v
-retrieving revision 1.96
-diff -u -p -b -r1.96 terminal.c
---- src/terminal.c 2 Apr 2006 12:21:12 -0000 1.96
-+++ src/terminal.c 13 Apr 2006 18:01:04 -0000
-@@ -1966,6 +1966,8 @@ terminal_app_new_terminal (TerminalApp
+--- ./src/terminal.c.real-transparency 2006-03-04 01:10:54.000000000 -0500
++++ ./src/terminal.c 2006-04-17 16:57:41.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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnome-terminal.spec 13 Apr 2006 19:15:58 -0000 1.40
+++ gnome-terminal.spec 17 Apr 2006 21:09:32 -0000 1.41
@@ -13,7 +13,7 @@
Summary: GNOME Terminal
Name: gnome-terminal
Version: 2.14.1
-Release: 4
+Release: 5
URL: http://www.gnome.org/
Source0: gnome-terminal-%{version}.tar.bz2
Source1: ne.po
@@ -103,11 +103,15 @@
%{_libdir}/bonobo
%changelog
+* Mon Apr 17 2006 Kristian Høgsberg <krh at redhat.com> 2.14.1-5
+- Fix gnome-terminal-2.14.1-real-transparency.patch to check for
+ window->priv != NULL before dereferencing.
+
* Thu Apr 13 2006 Kristian Høgsberg <krh at redhat.com> 2.14.1-4
- Bump for rawhide build.
* Thu Apr 13 2006 Kristian Høgsberg <krh at redhat.com> 2.14.1-3
-- Add vte-0.12.0-real-transparency.patch for extra bling points.
+- Add gnome-terminal-2.14.1-real-transparency.patch for extra bling points.
* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
- Update to 2.14.1
More information about the fedora-cvs-commits
mailing list