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

panels: Update for Shell API changes

Browse source
This commit is contained in:
Bastien Nocera 2011-11-07 17:50:40 +00:00
parent 27c45abda3
commit 6665b60422
27 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
panels/background/cc-background-panel.h
View file

@ -23,7 +23,7 @@
#ifndef _CC_BACKGROUND_PANEL_H #ifndef _CC_BACKGROUND_PANEL_H
#define _CC_BACKGROUND_PANEL_H #define _CC_BACKGROUND_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/bluetooth/cc-bluetooth-panel.c
View file

@ -26,7 +26,7 @@
#endif #endif
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <libgnome-control-center/cc-shell.h> #include <shell/cc-shell.h>
#include "cc-bluetooth-panel.h" #include "cc-bluetooth-panel.h"

2
panels/bluetooth/cc-bluetooth-panel.h
View file

@ -25,7 +25,7 @@
#ifndef _CC_BLUETOOTH_PANEL_H #ifndef _CC_BLUETOOTH_PANEL_H
#define _CC_BLUETOOTH_PANEL_H #define _CC_BLUETOOTH_PANEL_H
#include <libgnome-control-center/cc-shell.h> #include <shell/cc-shell.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/color/cc-color-panel.h
View file

@ -23,7 +23,7 @@
#ifndef _CC_COLOR_PANEL_H #ifndef _CC_COLOR_PANEL_H
#define _CC_COLOR_PANEL_H #define _CC_COLOR_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/datetime/cc-datetime-panel.h
View file

@ -23,7 +23,7 @@
#ifndef _CC_DATE_TIME_PANEL_H #ifndef _CC_DATE_TIME_PANEL_H
#define _CC_DATE_TIME_PANEL_H #define _CC_DATE_TIME_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/display/cc-display-panel.h
View file

@ -23,7 +23,7 @@
#ifndef _CC_DISPLAY_PANEL_H #ifndef _CC_DISPLAY_PANEL_H
#define _CC_DISPLAY_PANEL_H #define _CC_DISPLAY_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

1
panels/info/Makefile.am
View file

@ -8,7 +8,6 @@ INCLUDES = \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DDATADIR="\"$(datadir)\"" \ -DDATADIR="\"$(datadir)\"" \
-DLIBEXECDIR="\"$(libexecdir)\"" \ -DLIBEXECDIR="\"$(libexecdir)\"" \
-I$(top_srcdir)/libgnome-control-center/ \
$(NULL) $(NULL)
noinst_PROGRAMS = test-hostname noinst_PROGRAMS = test-hostname

2
panels/info/cc-info-panel.h
View file

@ -22,7 +22,7 @@
#ifndef _CC_INFO_PANEL_H #ifndef _CC_INFO_PANEL_H
#define _CC_INFO_PANEL_H #define _CC_INFO_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/keyboard/cc-keyboard-panel.h
View file

@ -23,7 +23,7 @@
#ifndef _CC_KEYBOARD_PANEL_H #ifndef _CC_KEYBOARD_PANEL_H
#define _CC_KEYBOARD_PANEL_H #define _CC_KEYBOARD_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/keyboard/gnome-keyboard-panel.h
View file

@ -3,7 +3,7 @@
*/ */
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
void gnome_keybinding_properties_init (CcPanel *panel, GtkBuilder *builder); void gnome_keybinding_properties_init (CcPanel *panel, GtkBuilder *builder);
void gnome_keybinding_properties_dispose (CcPanel *panel); void gnome_keybinding_properties_dispose (CcPanel *panel);

2
panels/keyboard/keyboard-general.h
View file

@ -20,7 +20,7 @@
*/ */
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
void keyboard_general_init (CcPanel *panel, GtkBuilder *builder); void keyboard_general_init (CcPanel *panel, GtkBuilder *builder);
void keyboard_general_dispose (CcPanel *panel); void keyboard_general_dispose (CcPanel *panel);

2
panels/keyboard/keyboard-shortcuts.h
View file

@ -20,7 +20,7 @@
*/ */
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
void keyboard_shortcuts_init (CcPanel *panel, GtkBuilder *builder); void keyboard_shortcuts_init (CcPanel *panel, GtkBuilder *builder);
void keyboard_shortcuts_dispose (CcPanel *panel); void keyboard_shortcuts_dispose (CcPanel *panel);

2
panels/mouse/cc-mouse-panel.h
View file

@ -23,7 +23,7 @@
#ifndef _CC_MOUSE_PANEL_H #ifndef _CC_MOUSE_PANEL_H
#define _CC_MOUSE_PANEL_H #define _CC_MOUSE_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/network/cc-network-panel.h
View file

@ -22,7 +22,7 @@
#ifndef _CC_NETWORK_PANEL_H #ifndef _CC_NETWORK_PANEL_H
#define _CC_NETWORK_PANEL_H #define _CC_NETWORK_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/network/network-dialogs.c
View file

@ -20,7 +20,7 @@
* Copyright 2008 - 2011 Red Hat, Inc. * Copyright 2008 - 2011 Red Hat, Inc.
*/ */
#include <libgnome-control-center/cc-shell.h> #include <shell/cc-shell.h>
#include <nm-utils.h> #include <nm-utils.h>
#include <nm-connection.h> #include <nm-connection.h>
#include <nm-setting-gsm.h> #include <nm-setting-gsm.h>

2
panels/online-accounts/cc-online-accounts-panel.h
View file

@ -23,7 +23,7 @@
#ifndef __GOA_PANEL_H__ #ifndef __GOA_PANEL_H__
#define __GOA_PANEL_H__ #define __GOA_PANEL_H__
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/power/cc-power-panel.h
View file

@ -22,7 +22,7 @@
#ifndef _CC_POWER_PANEL_H #ifndef _CC_POWER_PANEL_H
#define _CC_POWER_PANEL_H #define _CC_POWER_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/printers/Makefile.am
View file

@ -8,7 +8,7 @@ dist_ui_DATA = \
INCLUDES = \ INCLUDES = \
$(PANEL_CFLAGS) \ $(PANEL_CFLAGS) \
$(PRINTERS_PANEL_CFLAGS) \ $(PRINTERS_PANEL_CFLAGS) \
-I$(top_srcdir)/libgnome-control-center/ \ -I$(top_srcdir)/shell/ \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DDATADIR="\"$(uidir)\"" \ -DDATADIR="\"$(uidir)\"" \

2
panels/printers/cc-printers-panel.h
View file

@ -21,7 +21,7 @@
#ifndef _CC_PRINTERS_PANEL_H #ifndef _CC_PRINTERS_PANEL_H
#define _CC_PRINTERS_PANEL_H #define _CC_PRINTERS_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/region/cc-region-panel.h
View file

@ -23,7 +23,7 @@
#ifndef _CC_REGION_PANEL_H #ifndef _CC_REGION_PANEL_H
#define _CC_REGION_PANEL_H #define _CC_REGION_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/screen/cc-screen-panel.h
View file

@ -22,7 +22,7 @@
#ifndef _CC_SCREEN_PANEL_H #ifndef _CC_SCREEN_PANEL_H
#define _CC_SCREEN_PANEL_H #define _CC_SCREEN_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/sound/cc-sound-panel.h
View file

@ -21,7 +21,7 @@
#ifndef _CC_SOUND_PANEL_H #ifndef _CC_SOUND_PANEL_H
#define _CC_SOUND_PANEL_H #define _CC_SOUND_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
#include "gvc-mixer-control.h" #include "gvc-mixer-control.h"
#include "gvc-mixer-dialog.h" #include "gvc-mixer-dialog.h"

2
panels/universal-access/cc-ua-panel.h
View file

@ -24,7 +24,7 @@
#ifndef _CC_UA_PANEL_H #ifndef _CC_UA_PANEL_H
#define _CC_UA_PANEL_H #define _CC_UA_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

1
panels/user-accounts/Makefile.am
View file

@ -14,7 +14,6 @@ AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \ -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \
-I$(srcdir)/../common/ \ -I$(srcdir)/../common/ \
-I$(top_srcdir)/libgnome-control-center/ \
$(PANEL_CFLAGS) \ $(PANEL_CFLAGS) \
$(USER_ACCOUNTS_PANEL_CFLAGS) \ $(USER_ACCOUNTS_PANEL_CFLAGS) \
$(DISABLE_DEPRECATED) $(DISABLE_DEPRECATED)

3
panels/user-accounts/um-user-panel.c
View file

@ -40,12 +40,13 @@
#include "marshal.h" #include "marshal.h"
#include "shell/cc-editable-entry.h"
#include "um-user.h" #include "um-user.h"
#include "um-user-manager.h" #include "um-user-manager.h"
#include "um-strength-bar.h" #include "um-strength-bar.h"
#include "um-editable-button.h" #include "um-editable-button.h"
#include "cc-editable-entry.h"
#include "um-editable-combo.h" #include "um-editable-combo.h"
#include "um-account-dialog.h" #include "um-account-dialog.h"

2
panels/user-accounts/um-user-panel.h
View file

@ -22,7 +22,7 @@
#ifndef _UM_USER_PANEL_H #ifndef _UM_USER_PANEL_H
#define _UM_USER_PANEL_H #define _UM_USER_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
panels/wacom/cc-wacom-panel.h
View file

@ -22,7 +22,7 @@
#ifndef _CC_WACOM_PANEL_H #ifndef _CC_WACOM_PANEL_H
#define _CC_WACOM_PANEL_H #define _CC_WACOM_PANEL_H
#include <libgnome-control-center/cc-panel.h> #include <shell/cc-panel.h>
G_BEGIN_DECLS G_BEGIN_DECLS