[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/thunderbird/devel firefox-bug305970.patch, NONE, 1.1 thunderbird.spec, 1.51, 1.52



Author: caillon

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2419

Modified Files:
	thunderbird.spec 
Added Files:
	firefox-bug305970.patch 
Log Message:
* Mon Nov 28 2005 Christopher Aillon <caillon redhat com> - 1.5-0.5.1.rc1
- Fix issue with popup dialogs and other actions causing lockups


firefox-bug305970.patch:
 nsWindow.cpp |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

--- NEW FILE firefox-bug305970.patch ---
Index: mozilla/widget/src/gtk2/nsWindow.cpp
===================================================================
RCS file: /cvsroot/mozilla/widget/src/gtk2/nsWindow.cpp,v
retrieving revision 1.145.2.1
diff -d -u -p -r1.145.2.1 nsWindow.cpp
--- mozilla/widget/src/gtk2/nsWindow.cpp	18 Aug 2005 08:11:23 -0000	1.145.2.1
+++ mozilla/widget/src/gtk2/nsWindow.cpp	24 Nov 2005 14:32:31 -0000
@@ -148,9 +148,9 @@ static gboolean visibility_notify_event_
                                            GdkEventVisibility *event);
 static gboolean window_state_event_cb     (GtkWidget *widget,
                                            GdkEventWindowState *event);
-static void     style_set_cb              (GtkWidget *widget,
-                                           GtkStyle *previous_style,
-                                           gpointer data);
+static void     theme_changed_cb          (GtkSettings *settings,
+                                           GParamSpec *pspec,
+                                           nsWindow *data);
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -372,6 +372,10 @@ nsWindow::Destroy(void)
     mIsDestroyed = PR_TRUE;
     mCreated = PR_FALSE;
 
+    g_signal_handlers_disconnect_by_func(gtk_settings_get_default(),
+                                         (gpointer)G_CALLBACK(theme_changed_cb),
+                                         this);
+
     // ungrab if required
     nsCOMPtr<nsIWidget> rollupWidget = do_QueryReferent(gRollupWindow);
     if (NS_STATIC_CAST(nsIWidget *, this) == rollupWidget.get()) {
@@ -2434,8 +2438,16 @@ nsWindow::NativeCreate(nsIWidget        
                          G_CALLBACK(delete_event_cb), NULL);
         g_signal_connect(G_OBJECT(mShell), "window_state_event",
                          G_CALLBACK(window_state_event_cb), NULL);
-        g_signal_connect(G_OBJECT(mShell), "style_set",
-                         G_CALLBACK(style_set_cb), NULL);
+
+        g_signal_connect_after(gtk_settings_get_default(),
+                               "notify::gtk-theme-name",
+                               G_CALLBACK(theme_changed_cb), this);
+        g_signal_connect_after(gtk_settings_get_default(),
+                               "notify::gtk-key-theme-name",
+                               G_CALLBACK(theme_changed_cb), this);
+        g_signal_connect_after(gtk_settings_get_default(),
+                               "notify::gtk-font-name",
+                               G_CALLBACK(theme_changed_cb), this);
     }
 
     if (mContainer) {
@@ -3916,11 +3928,9 @@ window_state_event_cb (GtkWidget *widget
 
 /* static */
 void
-style_set_cb (GtkWidget *widget, GtkStyle *previous_style, gpointer data)
+theme_changed_cb (GtkSettings *settings, GParamSpec *pspec, nsWindow *data)
 {
-    nsWindow *window = get_window_for_gtk_widget(widget);
-    if (window)
-        window->ThemeChanged();
+    data->ThemeChanged();
 }
 
 //////////////////////////////////////////////////////////////////////


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- thunderbird.spec	5 Nov 2005 19:36:22 -0000	1.51
+++ thunderbird.spec	29 Nov 2005 15:40:38 -0000	1.52
@@ -10,7 +10,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	1.5
-Release:	0.5.0.rc1
+Release:	0.5.1.rc1
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -49,6 +49,7 @@
 Patch81:        firefox-nopangoxft.patch
 
 # patches from upstream (Patch100+)
+Patch100:       firefox-bug305970.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,6 +96,8 @@
 %patch42 -p0
 %patch81 -p1
 
+%patch100 -p1
+
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
 %if %{official_branding}
@@ -180,6 +183,9 @@
 #===============================================================================
 
 %changelog
+* Mon Nov 28 2005 Christopher Aillon <caillon redhat com> - 1.5-0.5.1.rc1
+- Fix issue with popup dialogs and other actions causing lockups
+
 * Sat Nov  5 2005 Christopher Aillon <caillon redhat com> 1.5-0.5.0.rc1
 - Update to 1.5 rc1
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]