GNOME.org
 

gnome-session r5164 - in trunk: . capplet compat egg gnome-session splash tools

Author: vuntz
Date: Wed Dec 10 06:04:58 2008
New Revision: 5164
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5164&view=rev

Log:
2008-12-10  Vincent Untz  <vuntz gnome org>

	* configure.in: remove TIME_UTILITY and GNOME_SESSION_TARBALL_* since
	it's unused, use GNOME_COMPILE_WARNINGS instead of some custom stuff
	to define compiler warning flags
	* capplet/Makefile.am:
	* compat/Makefile.am:
	* egg/Makefile.am:
	* gnome-session/Makefile.am:
	* splash/Makefile.am:
	* tools/Makefile.am: add WARN_CFLAGS/DISABLE_DEPRECATED_CFLAGS
	* gnome-session/gsm-inhibit-dialog.c: (add_inhibitor): fix compilation
	warning
	* splash/splash-window.c: (splash_window_expose_event): don't use
	deprecated API
	(splash_window_finalize): don't unref something we don't own


Modified:
   trunk/ChangeLog
   trunk/capplet/Makefile.am
   trunk/compat/Makefile.am
   trunk/configure.in
   trunk/egg/Makefile.am
   trunk/gnome-session/Makefile.am
   trunk/gnome-session/gsm-inhibit-dialog.c
   trunk/splash/Makefile.am
   trunk/splash/splash-window.c
   trunk/tools/Makefile.am

Modified: trunk/capplet/Makefile.am
==============================================================================
--- trunk/capplet/Makefile.am	(original)
+++ trunk/capplet/Makefile.am	Wed Dec 10 06:04:58 2008
@@ -4,6 +4,7 @@
 
 INCLUDES =						\
 	$(WARN_CFLAGS)					\
+	$(DISABLE_DEPRECATED_CFLAGS)			\
 	$(SESSION_PROPERTIES_CFLAGS)			\
 	$(GCONF_CFLAGS)					\
 	-I$(top_srcdir)/egg				\
@@ -25,4 +26,4 @@
 	gsm-properties-dialog.c				\
 	gsm-app-dialog.h				\
 	gsm-app-dialog.c				\
-	$(NULL)
\ No newline at end of file
+	$(NULL)

Modified: trunk/compat/Makefile.am
==============================================================================
--- trunk/compat/Makefile.am	(original)
+++ trunk/compat/Makefile.am	Wed Dec 10 06:04:58 2008
@@ -1,5 +1,6 @@
 INCLUDES =					\
 	$(WARN_CFLAGS)				\
+	$(DISABLE_DEPRECATED_CFLAGS)		\
 	$(DBUS_GLIB_CFLAGS)			\
 	$(GCONF_CFLAGS)				\
 	$(GTK_CFLAGS)				\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Dec 10 06:04:58 2008
@@ -31,14 +31,7 @@
 AT_SPI_REGISTRYD_DIR=$with_at_spi_registryd_directory
 AC_SUBST(AT_SPI_REGISTRYD_DIR)
 
-# Let distributor specify which utility to use when changing the time
-AC_ARG_WITH(time-utility,
-              [AC_HELP_STRING([--with-time-utility],
-                              [Specify the utility to use when changing the time @<:@default=@:>@])],,
-                              [with_time_utility=""])
-
-TIME_UTILITY=$with_time_utility
-AC_SUBST(TIME_UTILITY)
+GNOME_COMPILE_WARNINGS(maximum)
 
 AC_ARG_ENABLE(deprecations,
               [AC_HELP_STRING([--enable-deprecations],
@@ -274,48 +267,6 @@
 dnl End of IPv6 checks
 dnl ==============================================================================
 
-# Turn on the additional warnings last, so -Werror doesn't affect other tests.
-
-AC_ARG_ENABLE(more-warnings,
-	[AC_HELP_STRING([--enable-more-warnings],
-	[Maximum compiler warnings])],
-	set_more_warnings="$enableval",[
-        	if test -d $srcdir/.svn; then
-        		set_more_warnings=yes
-              	else
-                  	set_more_warnings=no
-              	fi
-        ])
-AC_MSG_CHECKING(for more warnings)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-        AC_MSG_RESULT(yes)
-        CFLAGS="\
-        -Wall \
-        -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-        -Wnested-externs -Wpointer-arith \
-        -Wcast-align -Wsign-compare -Wp,-D_FORTIFY_SOURCE=2 \
-        $CFLAGS"
-
-        for option in -Wno-strict-aliasing -Wno-sign-compare; do
-                SAVE_CFLAGS="$CFLAGS"
-                CFLAGS="$CFLAGS $option"
-                AC_MSG_CHECKING([whether gcc understands $option])
-                AC_TRY_COMPILE([], [],
-                        has_option=yes,
-                        has_option=no,)
-                if test $has_option = no; then
-                        CFLAGS="$SAVE_CFLAGS"
-                fi
-                AC_MSG_RESULT($has_option)
-                unset has_option
-                unset SAVE_CFLAGS
-        done
-        unset option
-else
-        AC_MSG_RESULT(no)
-fi
-
-
 # Don't use AC_PROG_AWK since we need the full pathname.
 AC_PATH_PROGS(AWK, mawk gawk nawk awk, )
 AC_PATH_PROGS(PERL, perl5 perl)
@@ -335,16 +286,6 @@
 fi
 AC_SUBST(REBUILD)
 
-GNOME_SESSION_TARBALL=`date +%e`
-AC_DEFINE_UNQUOTED(GNOME_SESSION_TARBALL_DAY, $GNOME_SESSION_TARBALL,
-                   [Define the day gnome-session tarball was generated])
-GNOME_SESSION_TARBALL=`date +%m | sed 's/^0//'`
-AC_DEFINE_UNQUOTED(GNOME_SESSION_TARBALL_MONTH, $GNOME_SESSION_TARBALL,
-                   [Define the month gnome-session tarball was generated])
-GNOME_SESSION_TARBALL=`date +%Y`
-AC_DEFINE_UNQUOTED(GNOME_SESSION_TARBALL_YEAR, $GNOME_SESSION_TARBALL,
-                   [Define the year gnome-session tarball was generated])
-
 AC_OUTPUT([
 Makefile
 capplet/Makefile

Modified: trunk/egg/Makefile.am
==============================================================================
--- trunk/egg/Makefile.am	(original)
+++ trunk/egg/Makefile.am	Wed Dec 10 06:04:58 2008
@@ -10,7 +10,8 @@
 	$(platform_defines)              \
 	$(EGG_SMCLIENT_CFLAGS)           \
 	$(EGG_LIBGNOMEUI_CFLAGS)	 \
-	$(WARN_CFLAGS)
+	$(WARN_CFLAGS)			 \
+	$(DISABLE_DEPRECATED_CFLAGS)
 
 noinst_LTLIBRARIES =                     \
 	libeggsmclient.la                \

Modified: trunk/gnome-session/Makefile.am
==============================================================================
--- trunk/gnome-session/Makefile.am	(original)
+++ trunk/gnome-session/Makefile.am	Wed Dec 10 06:04:58 2008
@@ -11,6 +11,7 @@
 
 INCLUDES =					\
 	$(WARN_CFLAGS)				\
+	$(DISABLE_DEPRECATED_CFLAGS)		\
 	$(GNOME_SESSION_CFLAGS)			\
 	$(DBUS_GLIB_CFLAGS)			\
 	$(GCONF_CFLAGS)				\

Modified: trunk/gnome-session/gsm-inhibit-dialog.c
==============================================================================
--- trunk/gnome-session/gsm-inhibit-dialog.c	(original)
+++ trunk/gnome-session/gsm-inhibit-dialog.c	Wed Dec 10 06:04:58 2008
@@ -568,7 +568,8 @@
                         GsmClient *client;
                         client = GSM_CLIENT (gsm_store_lookup (dialog->priv->clients, client_id));
                         if (client != NULL) {
-                                freeme = name = gsm_client_get_app_name (client);
+                                freeme = gsm_client_get_app_name (client);
+                                name = freeme;
                         }
                 }
         }

Modified: trunk/splash/Makefile.am
==============================================================================
--- trunk/splash/Makefile.am	(original)
+++ trunk/splash/Makefile.am	Wed Dec 10 06:04:58 2008
@@ -2,6 +2,8 @@
 
 INCLUDES =					\
 	-I$(top_srcdir)/egg			\
+	$(WARN_CFLAGS)				\
+	$(DISABLE_DEPRECATED_CFLAGS)		\
 	$(DBUS_GLIB_CFLAGS)			\
 	$(GCONF_CFLAGS)				\
 	$(LIBGNOMEUI_CFLAGS)			\

Modified: trunk/splash/splash-window.c
==============================================================================
--- trunk/splash/splash-window.c	(original)
+++ trunk/splash/splash-window.c	Wed Dec 10 06:04:58 2008
@@ -142,14 +142,16 @@
                 if (gdk_rectangle_intersect (&event->area,
                                              &si->position,
                                              &exposed)) {
-                        gdk_pixbuf_render_to_drawable (si->scaled, widget->window,
-                                                       widget->style->black_gc,
-                                                       exposed.x - si->position.x,
-                                                       exposed.y - si->position.y,
-                                                       exposed.x, exposed.y,
-                                                       exposed.width, exposed.height,
-                                                       GDK_RGB_DITHER_MAX,
-                                                       exposed.x, exposed.y);
+                        gdk_draw_pixbuf (
+                                widget->window,
+                                widget->style->black_gc,
+                                si->scaled,
+                                exposed.x - si->position.x,
+                                exposed.y - si->position.y,
+                                exposed.x, exposed.y,
+                                exposed.width, exposed.height,
+                                GDK_RGB_DITHER_MAX,
+                                exposed.x, exposed.y);
                 }
         }
 
@@ -241,7 +243,7 @@
 {
         GsmSplashWindow *splash = (GsmSplashWindow *) object;
 
-        g_object_unref (splash->icon_theme);
+        /* do not unref it: we don't own it */
         splash->icon_theme = NULL;
 
         g_list_foreach (splash->icons, (GFunc) splash_icon_destroy, NULL);

Modified: trunk/tools/Makefile.am
==============================================================================
--- trunk/tools/Makefile.am	(original)
+++ trunk/tools/Makefile.am	Wed Dec 10 06:04:58 2008
@@ -2,6 +2,7 @@
 
 INCLUDES =					\
 	$(WARN_CFLAGS)				\
+	$(DISABLE_DEPRECATED_CFLAGS)		\
 	$(GNOME_SESSION_CFLAGS)			\
 	$(DBUS_GLIB_CFLAGS)			\
 	$(GCONF_FLAGS)				\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]