quartz: Null check title before setting it

[~andy/gtk] / gdk / gdkkeynames.c

diff --git a/gdk/gdkkeynames.c b/gdk/gdkkeynames.c
index 6b155bceac02cda38f93fce15fbca907d606fbca..3767e291567f4c404e94ccd67e95b16ad6c78559 100644 (file)
--- a/gdk/gdkkeynames.c
+++ b/gdk/gdkkeynames.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/>.
  */
 
 /*
@@ -25,18 +23,18 @@
  */
 
 #include "config.h"
-#include <glib/gprintf.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "gdkkeysyms.h"
 #include "gdkinternals.h"
-#include "gdkalias.h"
 
 /* Key handling not part of the keymap */
 
 #include "keyname-table.h"
 
+#include <glib/gprintf.h>
+#include <stdlib.h>
+#include <string.h>
+
 #define GDK_NUM_KEYS G_N_ELEMENTS (gdk_keys_by_keyval)
 
 static int
@@ -45,8 +43,8 @@ gdk_keys_keyval_compare (const void *pkey, const void *pbase)
   return (*(int *) pkey) - ((gdk_key *) pbase)->keyval;
 }
 
-gchar*
-gdk_keyval_name (guint keyval)
+static gchar*
+_gdk_keyval_name (guint keyval)
 {
   static gchar buf[100];
   gdk_key *found;
@@ -86,8 +84,8 @@ gdk_keys_name_compare (const void *pkey, const void *pbase)
                 (const char *) (keynames + ((const gdk_key *) pbase)->offset));
 }
 
-guint
-gdk_keyval_from_name (const gchar *keyval_name)
+static guint
+_gdk_keyval_from_name (const gchar *keyval_name)
 {
   gdk_key *found;
 
@@ -99,8 +97,5 @@ gdk_keyval_from_name (const gchar *keyval_name)
   if (found != NULL)
     return found->keyval;
   else
-    return GDK_VoidSymbol;
+    return GDK_KEY_VoidSymbol;
 }
-
-#define __GDK_KEYNAMES_C__
-#include "gdkaliasdef.c"