summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Kohlberger <gerdk@svn.gnome.org>2008-04-11 07:12:14 +0000
committerGerd Kohlberger <gerdk@src.gnome.org>2008-04-11 07:12:14 +0000
commit4389eaa5ff91d8ee0d93a566613da7fbc4d8fac6 (patch)
tree0d2d42251fbfc6e5e310704c6e42db6fc9a5cacc
parentc0057bd40583367b6a2f21c8ceba05f75ef66c6a (diff)
downloadgnome-control-center-4389eaa5ff91d8ee0d93a566613da7fbc4d8fac6.tar.gz
Remove unused custom widget. Clean up. (Bug #527418)
2008-04-11 Gerd Kohlberger <gerdk@svn.gnome.org> * gnome-mouse-properties.c: (create_dialog): Remove unused custom widget. * gnome-mouse-accessibility.h: Clean up. (Bug #527418) svn path=/trunk/; revision=8644
-rw-r--r--capplets/mouse/ChangeLog5
-rw-r--r--capplets/mouse/gnome-mouse-accessibility.h60
-rw-r--r--capplets/mouse/gnome-mouse-properties.c41
3 files changed, 6 insertions, 100 deletions
diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index 215ff7bd8..4ae721193 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-11 Gerd Kohlberger <gerdk@svn.gnome.org>
+
+ * gnome-mouse-properties.c: (create_dialog): Remove unused custom widget.
+ * gnome-mouse-accessibility.h: Clean up. (Bug #527418)
+
2008-03-27 Jens Granseuer <jensgr@gmx.net>
Patch by: Patrick Wade <patrick.wade@sun.com>
diff --git a/capplets/mouse/gnome-mouse-accessibility.h b/capplets/mouse/gnome-mouse-accessibility.h
index 0c88bca21..ec76340e9 100644
--- a/capplets/mouse/gnome-mouse-accessibility.h
+++ b/capplets/mouse/gnome-mouse-accessibility.h
@@ -28,63 +28,3 @@ void setup_accessibility (GladeXML *dialog, GConfClient *client);
G_END_DECLS
#endif /* __GNOME_MOUSE_A11Y_H */
-/*
- * Copyright (C) 2007 Gerd Kohlberger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GNOME_MOUSE_A11Y_H
-#define __GNOME_MOUSE_A11Y_H
-
-#include <glade/glade.h>
-#include <gconf/gconf-client.h>
-
-G_BEGIN_DECLS
-
-void setup_accessibility (GladeXML *dialog, GConfClient *client);
-
-G_END_DECLS
-
-#endif /* __GNOME_MOUSE_A11Y_H */
-/*
- * Copyright (C) 2007 Gerd Kohlberger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GNOME_MOUSE_A11Y_H
-#define __GNOME_MOUSE_A11Y_H
-
-#include <glade/glade.h>
-#include <gconf/gconf-client.h>
-
-G_BEGIN_DECLS
-
-void setup_accessibility (GladeXML *dialog, GConfClient *client);
-
-G_END_DECLS
-
-#endif /* __GNOME_MOUSE_A11Y_H */
diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c
index 7fb2a97d2..0d2e2458b 100644
--- a/capplets/mouse/gnome-mouse-properties.c
+++ b/capplets/mouse/gnome-mouse-properties.c
@@ -46,42 +46,6 @@
#include <X11/Xcursor/Xcursor.h>
#endif
-/******************************************************************************/
-/* A quick custom widget to ensure that the left handed toggle works no matter
- * which button is pressed.
- */
-typedef struct { GtkCheckButton parent; } MouseCappletCheckButton;
-typedef struct { GtkCheckButtonClass parent; } MouseCappletCheckButtonClass;
-GNOME_CLASS_BOILERPLATE (MouseCappletCheckButton, mouse_capplet_check_button,
- GtkCheckButton, GTK_TYPE_CHECK_BUTTON)
-static void mouse_capplet_check_button_instance_init (MouseCappletCheckButton *obj) { }
-
-static gboolean
-mouse_capplet_check_button_button_press (GtkWidget *widget, GdkEventButton *event)
-{
- if (event->type == GDK_BUTTON_PRESS) {
- if (!GTK_WIDGET_HAS_FOCUS (widget))
- gtk_widget_grab_focus (widget);
- gtk_button_pressed (GTK_BUTTON (widget));
- }
- return TRUE;
-}
-static gboolean
-mouse_capplet_check_button_button_release (GtkWidget *widget, GdkEventButton *event)
-{
- gtk_button_released (GTK_BUTTON (widget));
- return TRUE;
-}
-
-static void
-mouse_capplet_check_button_class_init (MouseCappletCheckButtonClass *klass)
-{
- GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
- widget_class->button_press_event = mouse_capplet_check_button_button_press;
- widget_class->button_release_event = mouse_capplet_check_button_button_release;
-}
-/******************************************************************************/
-
enum
{
DOUBLE_CLICK_TEST_OFF,
@@ -254,7 +218,7 @@ event_box_button_press_event (GtkWidget *widget,
static gint test_on_timeout_id = 0;
static gint test_maybe_timeout_id = 0;
static guint32 double_click_timestamp = 0;
- GtkWidget *image;
+ GtkWidget *image;
GConfClient *client;
if (event->type != GDK_BUTTON_PRESS)
@@ -408,9 +372,6 @@ create_dialog (void)
GladeXML *dialog;
GtkSizeGroup *size_group;
- /* register the custom type */
- (void) mouse_capplet_check_button_get_type ();
-
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-mouse-properties.glade", "mouse_properties_dialog", NULL);
if (!dialog)
return NULL;