components/emacs/patches/gtkutil.patch
author Ali Bahrami <Ali.Bahrami@Oracle.COM>
Wed, 18 Dec 2013 15:13:15 -0700
branchs11-update
changeset 2856 47b35501403f
permissions -rw-r--r--
17516703 update GNU Emacs to 24.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2856
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
     1
# Prevent incorrect Gtk warning at startup when a specific geometry is
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
     2
# explicitly specified. See components/emacs/README.
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
     3
#
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
     4
--- emacs-24.3.orig/src/gtkutil.c	2013-01-12 12:29:19.000000000 -0700
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
     5
+++ emacs-24.3/src/gtkutil.c	2013-09-23 11:36:07.414160374 -0600
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
     6
@@ -813,6 +813,14 @@
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
     7
     General functions for creating widgets, resizing, events, e.t.c.
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
     8
  ***********************************************************************/
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
     9
 
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    10
+static void
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    11
+my_log_handler (const gchar *log_domain, GLogLevelFlags log_level,
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    12
+                const gchar *msg, gpointer user_data)
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    13
+{
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    14
+  if (!strstr (msg, "visible children"))
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    15
+    fprintf (stderr, "XX %s-WARNING **: %s\n", log_domain, msg);
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    16
+}
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    17
+
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    18
 /* Make a geometry string and pass that to GTK.  It seems this is the
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    19
    only way to get geometry position right if the user explicitly
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    20
    asked for a position when starting Emacs.
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    21
@@ -828,6 +836,7 @@
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    22
       int top = f->top_pos;
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    23
       int yneg = f->size_hint_flags & YNegative;
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    24
       char geom_str[sizeof "=x--" + 4 * INT_STRLEN_BOUND (int)];
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    25
+      guint id;
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    26
 
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    27
       if (xneg)
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    28
         left = -left;
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    29
@@ -840,6 +849,10 @@
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    30
                (xneg ? '-' : '+'), left,
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    31
                (yneg ? '-' : '+'), top);
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    32
 
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    33
+      /* Silence warning about visible children.  */
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    34
+      id = g_log_set_handler ("Gtk", G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    35
+                              | G_LOG_FLAG_RECURSION, my_log_handler, NULL);
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    36
+
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    37
       if (!gtk_window_parse_geometry (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    38
                                       geom_str))
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset
    39
         fprintf (stderr, "Failed to parse: '%s'\n", geom_str);