SF.net SVN: geany: [1832] trunk

[eht16 at users.sourceforge.net]

Revision: 1832
          http://geany.svn.sourceforge.net/geany/?rev=1832&view=rev
Author:   eht16
Date:     2007-08-28 03:50:18 -0700 (Tue, 28 Aug 2007)

Log Message:
-----------
Remove useless callback wrapper function.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
    trunk/src/callbacks.h
    trunk/src/keybindings.c
    trunk/src/main.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-08-28 10:48:52 UTC (rev 1831)
+++ trunk/ChangeLog	2007-08-28 10:50:18 UTC (rev 1832)
@@ -1,3 +1,9 @@
+2007-08-28  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/callbacks.c, src/callbacks.h, src/keybindings.c, src/main.c:
+   Remove useless callback wrapper function.
+
+
 2007-08-27  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/interface.c, geany.glade:

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2007-08-28 10:48:52 UTC (rev 1831)
+++ trunk/src/callbacks.c	2007-08-28 10:50:18 UTC (rev 1832)
@@ -808,15 +808,6 @@
 }
 
 
-gboolean
-on_window_key_press_event              (GtkWidget *widget,
-                                        GdkEventKey *event,
-                                        gpointer user_data)
-{
-	return event->keyval == 0 ? FALSE : keybindings_got_event(widget, event, user_data);
-}
-
-
 void
 on_crlf_activate                       (GtkMenuItem     *menuitem,
                                         gpointer         user_data)

Modified: trunk/src/callbacks.h
===================================================================
--- trunk/src/callbacks.h	2007-08-28 10:48:52 UTC (rev 1831)
+++ trunk/src/callbacks.h	2007-08-28 10:50:18 UTC (rev 1832)
@@ -378,11 +378,6 @@
                                         guint            page_num,
                                         gpointer         user_data);
 
-gboolean
-on_window_key_press_event              (GtkWidget *widget,
-                                        GdkEventKey *event,
-                                        gpointer user_data);
-
 void
 on_help_shortcuts1_activate            (GtkMenuItem     *menuitem,
                                         gpointer         user_data);

Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c	2007-08-28 10:48:52 UTC (rev 1831)
+++ trunk/src/keybindings.c	2007-08-28 10:50:18 UTC (rev 1832)
@@ -453,7 +453,7 @@
 	guint i;
 	GKeyFile *config = g_key_file_new();
 
-	// add comment if the file is newly created
+ 	// add comment if the file is newly created
 	if (! g_key_file_load_from_file(config, configfile, G_KEY_FILE_KEEP_COMMENTS, NULL))
 	{
 		g_key_file_set_comment(config, NULL, NULL, "Keybindings for Geany\nThe format looks like \"<Control>a\" or \"<Shift><Alt>F1\".\nBut you can also change the keys in Geany's preferences dialog.", NULL);
@@ -645,14 +645,21 @@
 {
 	guint i, k;
 
+	if (event->keyval == 0)
+		return FALSE;
+
+	// ignore caps-lock
 	if (event->state & GDK_LOCK_MASK)
-		event->state -= GDK_LOCK_MASK;	// ignore caps-lock
+		event->state -= GDK_LOCK_MASK;
 	// ignore numlock key, not necessary but nice
-	if (event->state & GDK_MOD2_MASK) event->state -= GDK_MOD2_MASK;
+	if (event->state & GDK_MOD2_MASK)
+		event->state -= GDK_MOD2_MASK;
 
 	// special cases
-	if (check_fixed_kb(event)) return TRUE;
-	if (check_construct_completion(event)) return TRUE;
+	if (check_fixed_kb(event))
+		return TRUE;
+	if (check_construct_completion(event))
+		return TRUE;
 
 	for (i = 0; i < GEANY_MAX_KEYS; i++)
 	{

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2007-08-28 10:48:52 UTC (rev 1831)
+++ trunk/src/main.c	2007-08-28 10:50:18 UTC (rev 1832)
@@ -692,7 +692,7 @@
 
 	// registering some basic events
 	g_signal_connect(G_OBJECT(app->window), "delete_event", G_CALLBACK(on_exit_clicked), NULL);
-	g_signal_connect(G_OBJECT(app->window), "key-press-event", G_CALLBACK(on_window_key_press_event), NULL);
+	g_signal_connect(G_OBJECT(app->window), "key-press-event", G_CALLBACK(keybindings_got_event), NULL);
 	g_signal_connect(G_OBJECT(app->toolbar), "button-press-event", G_CALLBACK(toolbar_popup_menu), NULL);
 	g_signal_connect(G_OBJECT(lookup_widget(app->window, "textview_scribble")),
 							"motion-notify-event", G_CALLBACK(on_motion_event), NULL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.