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

merge and update patch from

Browse source 
http://bugzilla.gnome.org/show_bug.cgi?id=134895
This commit is contained in:
Jody Goldberg 2004-03-31 21:30:23 +00:00
parent 46ba8cb67d
commit 9a9008178d
29 changed files with 121 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

14
capplets/common/capplet-util.h
View file

@ -30,20 +30,6 @@
/* Macros to make certain repetitive tasks a bit easier */
/* Print a debugging message */
#ifdef G_HAVE_ISO_VARARGS
# define DEBUG_MSG(str, ...) \
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "(%d:%s) " str, \
getpid (), G_GNUC_FUNCTION, __VA_ARGS__)
#elif defined(G_HAVE_GNUC_VARARGS)
# define DEBUG_MSG(str, args...) \
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "(%d:%s) " str, \
getpid (), G_GNUC_FUNCTION, args)
#else
# define DEBUG_MSG(str, args...)
#endif
/* Retrieve a widget from the Glade object */
#define WID(s) glade_xml_get_widget (dialog, s)

4
capplets/common/gnome-theme-info.h
View file

@ -33,7 +33,7 @@
typedef enum {
GNOME_THEME_TYPE_METATHEME,
GNOME_THEME_TYPE_ICON,
GNOME_THEME_TYPE_REGULAR,
GNOME_THEME_TYPE_REGULAR
} GnomeThemeType;
typedef enum {
@ -46,7 +46,7 @@ typedef enum {
typedef enum {
GNOME_THEME_METACITY = 1 << 0,
GNOME_THEME_GTK_2 = 1 << 1,
GNOME_THEME_GTK_2_KEYBINDING = 1 << 2,
GNOME_THEME_GTK_2_KEYBINDING = 1 << 2
} GnomeThemeElement;