Author: nick
Date: 2008-10-20 08:25:23 +0000 (Mon, 20 Oct 2008)
New Revision: 28315
Modified:
xfce4-settings/trunk/common/xfce-shortcuts-grabber.c
xfce4-settings/trunk/dialogs/appearance-settings/main.c
xfce4-settings/trunk/dialogs/keyboard-settings/frap-shortcuts-dialog.c
xfce4-settings/trunk/dialogs/keyboard-settings/frap-shortcuts.c
xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
xfce4-settings/trunk/xfce4-settings-editor/main_window.c
xfce4-settings/trunk/xfce4-settings-helper/workspaces.c
Log:
* Fix a bunch of compiler warnings and errors so we can actually build it...
Modified: xfce4-settings/trunk/common/xfce-shortcuts-grabber.c
===================================================================
--- xfce4-settings/trunk/common/xfce-shortcuts-grabber.c 2008-10-20
08:12:47 UTC (rev 28314)
+++ xfce4-settings/trunk/common/xfce-shortcuts-grabber.c 2008-10-20
08:25:23 UTC (rev 28315)
@@ -507,7 +507,7 @@
guint screens;
guint modifiers;
guint ignored_modifiers = 0;
- guint i;
+ gint i;
guint j;
guint k;
Modified: xfce4-settings/trunk/dialogs/appearance-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-10-20
08:12:47 UTC (rev 28314)
+++ xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-10-20
08:25:23 UTC (rev 28315)
@@ -205,6 +205,7 @@
}
}
+#ifdef ENABLE_SOUND_SETTINGS
static void
cb_enable_event_sounds_check_button_toggled (GtkToggleButton *toggle,
GtkWidget *button)
{
@@ -214,6 +215,7 @@
gtk_widget_set_sensitive (button, active);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), active);
}
+#endif
static void
appearance_settings_load_icon_themes (GtkListStore *list_store,
Modified: xfce4-settings/trunk/dialogs/keyboard-settings/frap-shortcuts-dialog.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/frap-shortcuts-dialog.c
2008-10-20 08:12:47 UTC (rev 28314)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/frap-shortcuts-dialog.c
2008-10-20 08:25:23 UTC (rev 28315)
@@ -22,6 +22,7 @@
#include <config.h>
#endif
+#include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
Modified: xfce4-settings/trunk/dialogs/keyboard-settings/frap-shortcuts.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/frap-shortcuts.c
2008-10-20 08:12:47 UTC (rev 28314)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/frap-shortcuts.c
2008-10-20 08:25:23 UTC (rev 28315)
@@ -131,7 +131,7 @@
if (G_UNLIKELY (!handled))
{
xfce_message_dialog (NULL, title, GTK_STOCK_DIALOG_ERROR,
- primary_text, _("The shortcut is already being used
for something else."),
+ _("The shortcut is already being used for something
else."), NULL,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
response = GTK_RESPONSE_REJECT;
}
Modified:
xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
2008-10-20 08:12:47 UTC (rev 28314)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
2008-10-20 08:25:23 UTC (rev 28315)
@@ -788,7 +788,6 @@
GList *iter;
XfceShortcut *sc;
GList *providers;
- gchar *value;
g_return_val_if_fail (XFCE_IS_KEYBOARD_SETTINGS (settings), FALSE);
g_return_val_if_fail (shortcut != NULL, FALSE);
Modified: xfce4-settings/trunk/xfce4-settings-editor/main_window.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-editor/main_window.c 2008-10-20
08:12:47 UTC (rev 28314)
+++ xfce4-settings/trunk/xfce4-settings-editor/main_window.c 2008-10-20
08:25:23 UTC (rev 28315)
@@ -485,11 +485,8 @@
static void
cb_property_edit_button_clicked (GtkButton *button, gpointer user_data)
{
- GtkTreeModel *model;
GValue value = {0, };
gchar *prop_name = NULL;
- gchar *temp = NULL;
- GtkWidget *channel_treeview = glade_xml_get_widget (gxml_main_window,
"channel_treeview");
GtkWidget *dialog = glade_xml_get_widget (gxml_main_window,
"edit_settings_dialog");
GtkWidget *prop_name_entry = glade_xml_get_widget (gxml_main_window,
"property_name_entry");
Modified: xfce4-settings/trunk/xfce4-settings-helper/workspaces.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/workspaces.c 2008-10-20
08:12:47 UTC (rev 28314)
+++ xfce4-settings/trunk/xfce4-settings-helper/workspaces.c 2008-10-20
08:25:23 UTC (rev 28315)
@@ -165,7 +165,7 @@
{
XfceWorkspacesHelper *helper = user_data;
GPtrArray *names;
- gint i, n_workspaces = wnck_screen_get_workspace_count(helper->screen);
+ guint i, n_workspaces = wnck_screen_get_workspace_count(helper->screen);
if(G_VALUE_TYPE(value) != dbus_g_type_get_collection("GPtrArray",
G_TYPE_VALUE))
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
