[glib] Don't warn in GApplication if class handlers have been overridden



commit 654ab34e3a7ea03dd7e86d16deae90df8e153d4c
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jan 21 10:52:48 2011 -0500

    Don't warn in GApplication if class handlers have been overridden
    
    https://bugzilla.gnome.org/show_bug.cgi?id=640042

 gio/gapplication.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gio/gapplication.c b/gio/gapplication.c
index 6ad23d0..7c2ff89 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -170,7 +170,8 @@ g_application_real_activate (GApplication *application)
 {
   if (!g_signal_has_handler_pending (application,
                                      g_application_signals[SIGNAL_ACTIVATE],
-                                     0, TRUE))
+                                     0, TRUE) &&
+      G_APPLICATION_GET_CLASS (application)->activate == g_application_real_activate)
     {
       static gboolean warned;
 
@@ -192,7 +193,8 @@ g_application_real_open (GApplication  *application,
 {
   if (!g_signal_has_handler_pending (application,
                                      g_application_signals[SIGNAL_OPEN],
-                                     0, TRUE))
+                                     0, TRUE) &&
+      G_APPLICATION_GET_CLASS (application)->open == g_application_real_open)
     {
       static gboolean warned;
 



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