diff --git a/panels/background/cc-background-panel.h b/panels/background/cc-background-panel.h index d9836b1af..e4ada0839 100644 --- a/panels/background/cc-background-panel.h +++ b/panels/background/cc-background-panel.h @@ -23,7 +23,7 @@ #ifndef _CC_BACKGROUND_PANEL_H #define _CC_BACKGROUND_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/bluetooth/cc-bluetooth-panel.c b/panels/bluetooth/cc-bluetooth-panel.c index ccb29addb..9cee15602 100644 --- a/panels/bluetooth/cc-bluetooth-panel.c +++ b/panels/bluetooth/cc-bluetooth-panel.c @@ -26,7 +26,7 @@ #endif #include -#include +#include #include "cc-bluetooth-panel.h" diff --git a/panels/bluetooth/cc-bluetooth-panel.h b/panels/bluetooth/cc-bluetooth-panel.h index b7192e5ac..2a37d7426 100644 --- a/panels/bluetooth/cc-bluetooth-panel.h +++ b/panels/bluetooth/cc-bluetooth-panel.h @@ -25,7 +25,7 @@ #ifndef _CC_BLUETOOTH_PANEL_H #define _CC_BLUETOOTH_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/color/cc-color-panel.h b/panels/color/cc-color-panel.h index 2b7070edd..afc022c43 100644 --- a/panels/color/cc-color-panel.h +++ b/panels/color/cc-color-panel.h @@ -23,7 +23,7 @@ #ifndef _CC_COLOR_PANEL_H #define _CC_COLOR_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/datetime/cc-datetime-panel.h b/panels/datetime/cc-datetime-panel.h index 27ae9ce0e..a47e18580 100644 --- a/panels/datetime/cc-datetime-panel.h +++ b/panels/datetime/cc-datetime-panel.h @@ -23,7 +23,7 @@ #ifndef _CC_DATE_TIME_PANEL_H #define _CC_DATE_TIME_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/display/cc-display-panel.h b/panels/display/cc-display-panel.h index 92e93bd65..75ef4a40b 100644 --- a/panels/display/cc-display-panel.h +++ b/panels/display/cc-display-panel.h @@ -23,7 +23,7 @@ #ifndef _CC_DISPLAY_PANEL_H #define _CC_DISPLAY_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/info/Makefile.am b/panels/info/Makefile.am index e20be67ed..dc9b8b447 100644 --- a/panels/info/Makefile.am +++ b/panels/info/Makefile.am @@ -8,7 +8,6 @@ INCLUDES = \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DDATADIR="\"$(datadir)\"" \ -DLIBEXECDIR="\"$(libexecdir)\"" \ - -I$(top_srcdir)/libgnome-control-center/ \ $(NULL) noinst_PROGRAMS = test-hostname diff --git a/panels/info/cc-info-panel.h b/panels/info/cc-info-panel.h index cd2bb47c5..75397ad73 100644 --- a/panels/info/cc-info-panel.h +++ b/panels/info/cc-info-panel.h @@ -22,7 +22,7 @@ #ifndef _CC_INFO_PANEL_H #define _CC_INFO_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/keyboard/cc-keyboard-panel.h b/panels/keyboard/cc-keyboard-panel.h index fe6a0112f..d9f766518 100644 --- a/panels/keyboard/cc-keyboard-panel.h +++ b/panels/keyboard/cc-keyboard-panel.h @@ -23,7 +23,7 @@ #ifndef _CC_KEYBOARD_PANEL_H #define _CC_KEYBOARD_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/keyboard/gnome-keyboard-panel.h b/panels/keyboard/gnome-keyboard-panel.h index 9cd0487a2..2aa949483 100644 --- a/panels/keyboard/gnome-keyboard-panel.h +++ b/panels/keyboard/gnome-keyboard-panel.h @@ -3,7 +3,7 @@ */ #include -#include +#include void gnome_keybinding_properties_init (CcPanel *panel, GtkBuilder *builder); void gnome_keybinding_properties_dispose (CcPanel *panel); diff --git a/panels/keyboard/keyboard-general.h b/panels/keyboard/keyboard-general.h index f5f77e1a6..f47e5765d 100644 --- a/panels/keyboard/keyboard-general.h +++ b/panels/keyboard/keyboard-general.h @@ -20,7 +20,7 @@ */ #include -#include +#include void keyboard_general_init (CcPanel *panel, GtkBuilder *builder); void keyboard_general_dispose (CcPanel *panel); diff --git a/panels/keyboard/keyboard-shortcuts.h b/panels/keyboard/keyboard-shortcuts.h index 03b4e3fe2..11a96f6ac 100644 --- a/panels/keyboard/keyboard-shortcuts.h +++ b/panels/keyboard/keyboard-shortcuts.h @@ -20,7 +20,7 @@ */ #include -#include +#include void keyboard_shortcuts_init (CcPanel *panel, GtkBuilder *builder); void keyboard_shortcuts_dispose (CcPanel *panel); diff --git a/panels/mouse/cc-mouse-panel.h b/panels/mouse/cc-mouse-panel.h index 7309849ca..65ff56e40 100644 --- a/panels/mouse/cc-mouse-panel.h +++ b/panels/mouse/cc-mouse-panel.h @@ -23,7 +23,7 @@ #ifndef _CC_MOUSE_PANEL_H #define _CC_MOUSE_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/network/cc-network-panel.h b/panels/network/cc-network-panel.h index 7bb8157c8..d9b08fb9c 100644 --- a/panels/network/cc-network-panel.h +++ b/panels/network/cc-network-panel.h @@ -22,7 +22,7 @@ #ifndef _CC_NETWORK_PANEL_H #define _CC_NETWORK_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c index 0e5aae128..9721e61be 100644 --- a/panels/network/network-dialogs.c +++ b/panels/network/network-dialogs.c @@ -20,7 +20,7 @@ * Copyright 2008 - 2011 Red Hat, Inc. */ -#include +#include #include #include #include diff --git a/panels/online-accounts/cc-online-accounts-panel.h b/panels/online-accounts/cc-online-accounts-panel.h index cc1adb472..901c5efbc 100644 --- a/panels/online-accounts/cc-online-accounts-panel.h +++ b/panels/online-accounts/cc-online-accounts-panel.h @@ -23,7 +23,7 @@ #ifndef __GOA_PANEL_H__ #define __GOA_PANEL_H__ -#include +#include G_BEGIN_DECLS diff --git a/panels/power/cc-power-panel.h b/panels/power/cc-power-panel.h index 9f3716743..01f6828f7 100644 --- a/panels/power/cc-power-panel.h +++ b/panels/power/cc-power-panel.h @@ -22,7 +22,7 @@ #ifndef _CC_POWER_PANEL_H #define _CC_POWER_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am index 31dd7204d..0dade8cc3 100644 --- a/panels/printers/Makefile.am +++ b/panels/printers/Makefile.am @@ -8,7 +8,7 @@ dist_ui_DATA = \ INCLUDES = \ $(PANEL_CFLAGS) \ $(PRINTERS_PANEL_CFLAGS) \ - -I$(top_srcdir)/libgnome-control-center/ \ + -I$(top_srcdir)/shell/ \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DDATADIR="\"$(uidir)\"" \ diff --git a/panels/printers/cc-printers-panel.h b/panels/printers/cc-printers-panel.h index 506e8ca84..c14023437 100644 --- a/panels/printers/cc-printers-panel.h +++ b/panels/printers/cc-printers-panel.h @@ -21,7 +21,7 @@ #ifndef _CC_PRINTERS_PANEL_H #define _CC_PRINTERS_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/region/cc-region-panel.h b/panels/region/cc-region-panel.h index 00b2d18e9..c67b18eec 100644 --- a/panels/region/cc-region-panel.h +++ b/panels/region/cc-region-panel.h @@ -23,7 +23,7 @@ #ifndef _CC_REGION_PANEL_H #define _CC_REGION_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/screen/cc-screen-panel.h b/panels/screen/cc-screen-panel.h index 851a20795..6280b7874 100644 --- a/panels/screen/cc-screen-panel.h +++ b/panels/screen/cc-screen-panel.h @@ -22,7 +22,7 @@ #ifndef _CC_SCREEN_PANEL_H #define _CC_SCREEN_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/sound/cc-sound-panel.h b/panels/sound/cc-sound-panel.h index fda5fb7e7..74962c9a0 100644 --- a/panels/sound/cc-sound-panel.h +++ b/panels/sound/cc-sound-panel.h @@ -21,7 +21,7 @@ #ifndef _CC_SOUND_PANEL_H #define _CC_SOUND_PANEL_H -#include +#include #include "gvc-mixer-control.h" #include "gvc-mixer-dialog.h" diff --git a/panels/universal-access/cc-ua-panel.h b/panels/universal-access/cc-ua-panel.h index 4254fa5c5..a36e0c856 100644 --- a/panels/universal-access/cc-ua-panel.h +++ b/panels/universal-access/cc-ua-panel.h @@ -24,7 +24,7 @@ #ifndef _CC_UA_PANEL_H #define _CC_UA_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/user-accounts/Makefile.am b/panels/user-accounts/Makefile.am index 6a3f2987e..7a19dc9ba 100644 --- a/panels/user-accounts/Makefile.am +++ b/panels/user-accounts/Makefile.am @@ -14,7 +14,6 @@ AM_CPPFLAGS = \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \ -I$(srcdir)/../common/ \ - -I$(top_srcdir)/libgnome-control-center/ \ $(PANEL_CFLAGS) \ $(USER_ACCOUNTS_PANEL_CFLAGS) \ $(DISABLE_DEPRECATED) diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c index 41d29abac..43135ac02 100644 --- a/panels/user-accounts/um-user-panel.c +++ b/panels/user-accounts/um-user-panel.c @@ -40,12 +40,13 @@ #include "marshal.h" +#include "shell/cc-editable-entry.h" + #include "um-user.h" #include "um-user-manager.h" #include "um-strength-bar.h" #include "um-editable-button.h" -#include "cc-editable-entry.h" #include "um-editable-combo.h" #include "um-account-dialog.h" diff --git a/panels/user-accounts/um-user-panel.h b/panels/user-accounts/um-user-panel.h index 4f5aec0fb..047659548 100644 --- a/panels/user-accounts/um-user-panel.h +++ b/panels/user-accounts/um-user-panel.h @@ -22,7 +22,7 @@ #ifndef _UM_USER_PANEL_H #define _UM_USER_PANEL_H -#include +#include G_BEGIN_DECLS diff --git a/panels/wacom/cc-wacom-panel.h b/panels/wacom/cc-wacom-panel.h index 55f2fb29f..e219a37cb 100644 --- a/panels/wacom/cc-wacom-panel.h +++ b/panels/wacom/cc-wacom-panel.h @@ -22,7 +22,7 @@ #ifndef _CC_WACOM_PANEL_H #define _CC_WACOM_PANEL_H -#include +#include G_BEGIN_DECLS