applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove libglade dependency on gnome-mouse-properties

Browse source
This commit is contained in:
Robert Ancell 2009-07-30 13:26:35 +10:00
parent d224c36f6e
commit 5e17d0984f
6 changed files with 581 additions and 419 deletions
Download patch file Download diff file Expand all files Collapse all files

22
capplets/mouse/gnome-mouse-properties.c
View file

@ -28,7 +28,6 @@
#include <glib/gi18n.h>
#include <string.h>
#include <gconf/gconf-client.h>
#include <glade/glade.h>
#include <gdk/gdkx.h>
#include <math.h>
@ -50,6 +49,9 @@
#include <X11/Xcursor/Xcursor.h>
#endif
#undef WID
#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s))
enum
{
DOUBLE_CLICK_TEST_OFF,
@ -319,7 +321,7 @@ left_handed_to_gconf (GConfPropertyEditor *peditor,
static void
scrollmethod_radio_button_release_event (GtkWidget *widget,
GdkEventButton *event,
GladeXML *dialog)
GtkBuilder *dialog)
{
gtk_widget_set_sensitive (WID ("horiz_scroll_toggle"),
(widget != WID ("scroll_disabled_radio")));
@ -411,7 +413,7 @@ find_synaptics (void)
/* Set up the property editors in the dialog. */
static void
setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
setup_dialog (GtkBuilder *dialog, GConfChangeSet *changeset)
{
GtkRadioButton *radio;
GObject *peditor;
@ -488,15 +490,19 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
/* Construct the dialog */
static GladeXML *
static GtkBuilder *
create_dialog (void)
{
GladeXML *dialog;
GtkBuilder *dialog;
GtkSizeGroup *size_group;
GError *error = NULL;
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-mouse-properties.glade", "mouse_properties_dialog", NULL);
if (!dialog)
dialog = gtk_builder_new ();
gtk_builder_add_from_file (dialog, GNOMECC_UI_DIR "/gnome-mouse-properties.ui", &error);
if (error != NULL) {
g_warning ("Error loading UI file: %s", error->message);
return NULL;
}
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
gtk_size_group_add_widget (size_group, WID ("acceleration_label"));
@ -550,7 +556,7 @@ int
main (int argc, char **argv)
{
GConfClient *client;
GladeXML *dialog;
GtkBuilder *dialog;
GtkWidget *dialog_win, *w;
gchar *start_page = NULL;