ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Cody Russell (bratsche)
Related merge proposals:
  https://code.launchpad.net/~bratsche/xsplash/new-background/+merge/13796
  proposed by: Cody Russell (bratsche)
  review: Approve - Ted Gould (ted)
------------------------------------------------------------
revno: 89 [merge]
committer: Cody Russell <crussell@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2009-10-22 13:32:39 -0500
message:
  Switch to new 2560x1600 image
removed:
  images/bg_1024x768.jpg
  images/bg_1280x1024.jpg
  images/bg_1440x900.jpg
  images/bg_1680x1050.jpg
  images/bg_1920x1200.jpg
  images/bg_800x600.jpg
modified:
  images/Makefile.am
  images/bg_2560x1600.jpg
  src/xsplash.c


--
lp:xsplash
https://code.launchpad.net/~xsplash-team/xsplash/trunk

Your team ayatana-commits is subscribed to branch lp:xsplash.
To unsubscribe from this branch go to https://code.launchpad.net/~xsplash-team/xsplash/trunk/+edit-subscription.

=== modified file 'images/Makefile.am'
--- images/Makefile.am	2009-09-29 17:18:17 +0000
+++ images/Makefile.am	2009-10-21 13:06:01 +0000
@@ -2,13 +2,7 @@
 
 imagesdir = $(datadir)/images/xsplash
 
-images_DATA =	bg_800x600.jpg		\
-		bg_1024x768.jpg		\
-		bg_1280x1024.jpg	\
-		bg_1440x900.jpg		\
-		bg_1680x1050.jpg	\
-		bg_1920x1200.jpg	\
-		bg_2560x1600.jpg	\
+images_DATA =	bg_2560x1600.jpg	\
 		logo_small.png		\
 		logo_medium.png		\
 		logo_large.png		\

=== removed file 'images/bg_1024x768.jpg'
Binary files images/bg_1024x768.jpg	2009-08-31 18:47:10 +0000 and images/bg_1024x768.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/bg_1280x1024.jpg'
Binary files images/bg_1280x1024.jpg	2009-08-31 18:47:10 +0000 and images/bg_1280x1024.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/bg_1440x900.jpg'
Binary files images/bg_1440x900.jpg	2009-08-31 18:47:10 +0000 and images/bg_1440x900.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/bg_1680x1050.jpg'
Binary files images/bg_1680x1050.jpg	2009-08-31 18:47:10 +0000 and images/bg_1680x1050.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/bg_1920x1200.jpg'
Binary files images/bg_1920x1200.jpg	2009-08-31 18:47:10 +0000 and images/bg_1920x1200.jpg	1970-01-01 00:00:00 +0000 differ
=== modified file 'images/bg_2560x1600.jpg'
Binary files images/bg_2560x1600.jpg	2009-08-31 18:47:10 +0000 and images/bg_2560x1600.jpg	2009-10-21 12:57:06 +0000 differ
=== removed file 'images/bg_800x600.jpg'
Binary files images/bg_800x600.jpg	2009-08-31 18:47:10 +0000 and images/bg_800x600.jpg	1970-01-01 00:00:00 +0000 differ
=== modified file 'src/xsplash.c'
--- src/xsplash.c	2009-10-15 16:31:57 +0000
+++ src/xsplash.c	2009-10-21 13:06:01 +0000
@@ -353,38 +353,7 @@
 static gchar *
 get_background_filename (void)
 {
-  gint widths[] =  { 2560, 1920, 1680, 1440, 1280, 1024, 800 };
-  gint heights[] = { 1600, 1200, 1050, 900,  1024, 768,  600 };
-  gint width, height;
-  gint i;
-  gint last_good = 0;
-  gchar *ret;
-
-  width = get_monitor_width ();
-  height = get_monitor_height ();
-
-  g_message ("get_background_filename(): looking for appropriate resolution...");
-  for (i = 0; i < (sizeof (widths) / sizeof (gint)); i++)
-    {
-      if (widths[i] > width && heights[i] && height)
-        {
-          g_message (" ** %dx%d will work.", widths[i], heights[i]);
-          last_good = i;
-        }
-      else
-        {
-          g_message (" ** %dx%d is too small, using last good size.", widths[i], heights[i]);
-          break;
-        }
-    }
-
-  g_message (" ** Found a resolution: %dx%d", widths[last_good], heights[last_good]);
-
-  ret = g_strdup_printf (DATADIR "/images/xsplash/bg_%dx%d.jpg", widths[last_good], heights[last_good]);
-
-  g_message (" ** filename: %s", ret);
-
-  return ret;
+  return g_strdup (DATADIR "/images/xsplash/bg_2560x1600.jpg");
 }
 
 static const gchar *