gnome-desktop r5134 - trunk/libgnome-desktop

[ssp svn gnome org]

Author: ssp
Date: Tue Jul  8 17:44:07 2008
New Revision: 5134
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5134&view=rev

Log:
Tue Jul  8 13:25:58 2008  S%GÃÂÂ% ren Sandmann  <sandmann redhat com>

	* display-name.c: Translate a couple of strings

	* gnome-rr.c: Remove some unused code.




Modified:
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/display-name.c
   trunk/libgnome-desktop/gnome-rr.c

Modified: trunk/libgnome-desktop/display-name.c
==============================================================================
--- trunk/libgnome-desktop/display-name.c	(original)
+++ trunk/libgnome-desktop/display-name.c	Tue Jul  8 17:44:07 2008
@@ -22,6 +22,8 @@
 
 /* Author: Soren Sandmann <sandmann redhat com> */
 
+#include <config.h>
+#include <glib/gi18n-lib.h>
 #include <stdlib.h>
 #include <math.h>
 #include <stdio.h>
@@ -207,7 +209,7 @@
 	 strstr ("LVDS", output_name)	||
 	 strstr ("Lvds", output_name)))
     {
-	vendor = "Laptop";
+	vendor = _("Laptop");
     }
     else if (info)
     {
@@ -215,7 +217,7 @@
     }
     else
     {
-	vendor = "Unknown";
+	vendor = _("Unknown");
     }
 
     if (info && info->width_mm != -1 && info->height_mm)

Modified: trunk/libgnome-desktop/gnome-rr.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr.c	(original)
+++ trunk/libgnome-desktop/gnome-rr.c	Tue Jul  8 17:44:07 2008
@@ -327,7 +327,9 @@
     }
     else
     {
+#if 0
 	g_print ("Couldn't get screen resources\n");
+#endif
 	
 	return FALSE;
     }
@@ -638,7 +640,9 @@
     GPtrArray *a;
     int i;
     
+#if 0
     g_print ("Output %lx Timestamp: %u\n", output->id, (guint32)info->timestamp);
+#endif
     
     if (!info || !output->info)
     {
@@ -1037,7 +1041,9 @@
     GPtrArray *a;
     int i;
     
+#if 0
     g_print ("CRTC %lx Timestamp: %u\n", crtc->id, (guint32)info->timestamp);
+#endif
     
     if (!info)
     {
@@ -1148,68 +1154,3 @@
     g_free (mode->name);
     g_free (mode);
 }
-
-
-#ifdef INCLUDE_MAIN
-static void
-on_screen_changed (GnomeRRScreen *screen, gpointer data)
-{
-    g_print ("Changed\n");
-}
-
-static gboolean
-do_refresh (gpointer data)
-{
-    GnomeRRScreen *screen = data;
-    
-    gnome_rr_screen_refresh (screen);
-    
-    return TRUE;
-}
-
-int
-main (int argc, char **argv)
-{
-    int i;
-    
-    gtk_init (&argc, &argv);
-    
-    GnomeRRScreen *screen = gnome_rr_screen_new (gdk_screen_get_default(),
-					    on_screen_changed,
-					    NULL);
-    
-    for (i = 0; screen->info->crtcs[i]; ++i)
-    {
-	GnomeRRCrtc *crtc = screen->info->crtcs[i];
-	
-	if (crtc->current_mode)
-	{
-	    g_print ("CRTC %p: (%d %d %d %d)\n",
-		     crtc, crtc->x, crtc->y,
-		     crtc->current_mode->width, crtc->current_mode->height);
-	}
-	else
-	{
-	    g_print ("CRTC %p: turned off\n", crtc);
-	}
-    }
-    
-    for (i = 0; screen->info->outputs[i]; ++i)
-    {
-	GnomeRROutput *output = screen->info->outputs[i];
-	
-	g_print ("Output %s currently", output->name);
-	
-	if (!output->current_crtc)
-	    g_print (" turned off\n");
-	else
-	    g_print (" driven by CRTC %p\n", output->current_crtc);
-    }
-    
-    g_timeout_add (500, do_refresh, screen);
-    
-    gtk_main ();
-    
-    return 0;
-}
-#endif