gnome-applets r10762 - trunk/gswitchit
- From: svu svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-applets r10762 - trunk/gswitchit
- Date: Sun, 23 Mar 2008 14:47:36 +0000 (GMT)
Author: svu
Date: Sun Mar 23 14:47:36 2008
New Revision: 10762
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=10762&view=rev
Log:
updating from deprecated function, #523704
Modified:
trunk/gswitchit/ChangeLog
trunk/gswitchit/gswitchit-applet.c
Modified: trunk/gswitchit/gswitchit-applet.c
==============================================================================
--- trunk/gswitchit/gswitchit-applet.c (original)
+++ trunk/gswitchit/gswitchit-applet.c Sun Mar 23 14:47:36 2008
@@ -269,7 +269,7 @@
{
GtkBuilder *builder =
GTK_BUILDER (gtk_object_get_data
- (GTK_OBJECT (dialog), "builderData"));
+ (GTK_OBJECT (dialog), "builderData"));
g_object_unref (G_OBJECT (builder));
g_hash_table_remove (globals.previewDialogs,
GINT_TO_POINTER (group));
@@ -313,15 +313,19 @@
GError *error = NULL;
builder = gtk_builder_new ();
- gtk_builder_add_from_file (builder, GTK_BUILDERDIR "/gswitchit.ui", &error);
+ gtk_builder_add_from_file (builder, GTK_BUILDERDIR "/gswitchit.ui",
+ &error);
if (error) {
- g_error ("building ui from %s failed: %s", GTK_BUILDERDIR "/gswitchit.ui", error->message);
- g_clear_error (&error);
- }
+ g_error ("building ui from %s failed: %s",
+ GTK_BUILDERDIR "/gswitchit.ui", error->message);
+ g_clear_error (&error);
+ }
- dialog = GTK_WIDGET (gtk_builder_get_object (builder, "gswitchit_layout_view"));
+ dialog =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder, "gswitchit_layout_view"));
kbdraw = gkbd_keyboard_drawing_new ();
if (xklState->group >= 0 &&
@@ -403,8 +407,8 @@
gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
gtk_container_add (GTK_CONTAINER
- (gtk_builder_get_object (builder, "preview_vbox")),
- kbdraw);
+ (gtk_builder_get_object
+ (builder, "preview_vbox")), kbdraw);
gtk_object_set_data (GTK_OBJECT (dialog), "kbdraw", kbdraw);
@@ -579,9 +583,9 @@
/* Layout preview is for XKB only */
bonobo_ui_component_set_prop (popup, "/commands/Preview",
"sensitive",
- g_strcasecmp ("XKB",
- engine_backend_name) ?
- "0" : "1", NULL);
+ g_ascii_strcasecmp ("XKB",
+ engine_backend_name)
+ ? "0" : "1", NULL);
/* Delete the plugins item if the binary does not exist */
if (pluginsCappletFullPath == NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]