printing: Don't load custom paper sizes in file backend

[~andy/gtk] / modules / input / gtkimcontextmultipress.c

diff --git a/modules/input/gtkimcontextmultipress.c b/modules/input/gtkimcontextmultipress.c
index 7c2a2282e748245d05c1891940d9eb5b9479c50e..7fb484a07ceddf0aee42403c77b52449f68d94d8 100644 (file)
--- a/modules/input/gtkimcontextmultipress.c
+++ b/modules/input/gtkimcontextmultipress.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gtkimcontextmultipress.h"
@@ -199,7 +197,7 @@ on_timeout (gpointer data)
 {
   GtkImContextMultipress *multipress_context;
 
-  GDK_THREADS_ENTER ();
+  gdk_threads_enter ();
 
   multipress_context = GTK_IM_CONTEXT_MULTIPRESS (data);
 
@@ -209,9 +207,9 @@ on_timeout (gpointer data)
 
   multipress_context->timeout_id = 0;
 
-  GDK_THREADS_LEAVE ();
+  gdk_threads_leave ();
 
-  return FALSE; /* don't call me again */
+  return G_SOURCE_REMOVE; /* don't call me again */
 }
 
 static gboolean
@@ -410,7 +408,7 @@ load_config (GtkImContextMultipress *self)
 
       keyval = gdk_keyval_from_name (keys[i]);
 
-      if (keyval == GDK_VoidSymbol)
+      if (keyval == GDK_KEY_VoidSymbol)
         {
           g_warning ("Error while trying to read the %s configuration file: "
                      "invalid key name \"%s\"",