Translation updated by Ivar Smolin.

[~andy/gtk] / gdk / gdkdisplaymanager.c

diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 2215cb8c24d7e7d794239544be5b9ade338d7bd9..157bcf42c4171ff66add4583c48b96e3cbaf5548 100644 (file)
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -26,6 +26,7 @@
 
 #include <config.h>
 
+#include "gdkscreen.h"
 #include "gdkdisplay.h"
 #include "gdkdisplaymanager.h"
 
@@ -34,6 +35,8 @@
 
 #include "gdkintl.h"
 
+#include "gdkalias.h"
+
 struct _GdkDisplayManager
 {
   GObject parent_instance;
@@ -62,7 +65,7 @@ static void gdk_display_manager_get_property (GObject                *object,
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-GdkDisplay *default_display = NULL;
+static GdkDisplay *default_display = NULL;
 
 GType
 gdk_display_manager_get_type (void)
@@ -100,6 +103,15 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
   object_class->set_property = gdk_display_manager_set_property;
   object_class->get_property = gdk_display_manager_get_property;
 
+  /**
+   * GdkDisplayManager::display-opened:
+   * @display_manager: the object on which the signal is emitted
+   * @display: the opened display
+   *
+   * The ::display_opened signal is emitted when a display is opened.
+   *
+   * Since: 2.2
+   */
   signals[DISPLAY_OPENED] =
     g_signal_new ("display_opened",
                  G_OBJECT_CLASS_TYPE (object_class),
@@ -114,10 +126,11 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
   g_object_class_install_property (object_class,
                                   PROP_DEFAULT_DISPLAY,
                                   g_param_spec_object ("default-display",
-                                                       _("Default Display"),
-                                                       _("The default display for GDK"),
+                                                       P_("Default Display"),
+                                                       P_("The default display for GDK"),
                                                        GDK_TYPE_DISPLAY,
-                                                       G_PARAM_READWRITE));
+                                                       G_PARAM_READWRITE|G_PARAM_STATIC_NAME|
+                                                       G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
 }
 
 static void
@@ -160,6 +173,8 @@ gdk_display_manager_get_property (GObject      *object,
  *
  * Returns the global #GdkDisplayManager singleton; gdk_parse_pargs(),
  * gdk_init(), or gdk_init_check() must have been called first.
+ *
+ * Since: 2.2
  **/
 GdkDisplayManager*
 gdk_display_manager_get (void)
@@ -174,15 +189,14 @@ gdk_display_manager_get (void)
 
 /**
  * gdk_display_manager_get_default_display:
+ * @display_manager: a #GdkDisplayManager 
  *
- * Gets the default #GdkDisplay. This is a convenience
- * function for:
- * <programlisting>
- *   gdk_display_manager_get_default_display (gdk_display_manager_get ())
- * </programlisting>
+ * Gets the default #GdkDisplay. 
  * 
  * Returns: a #GdkDisplay, or %NULL if there is no default
  *   display.
+ *
+ * Since: 2.2
  */
 GdkDisplay *
 gdk_display_manager_get_default_display (GdkDisplayManager *display_manager)
@@ -201,6 +215,8 @@ gdk_display_manager_get_default_display (GdkDisplayManager *display_manager)
  * 
  * Returns: a #GdkDisplay, or %NULL if there is no default
  *   display.
+ *
+ * Since: 2.2
  */
 GdkDisplay *
 gdk_display_get_default (void)
@@ -214,19 +230,27 @@ gdk_display_get_default (void)
  * Gets the default screen for the default display. (See
  * gdk_display_get_default ()).
  * 
- * Returns: a #GdkScreen.
+ * Returns: a #GdkScreen, or %NULL if there is no default display.
+ *
+ * Since: 2.2
  */
 GdkScreen *
 gdk_screen_get_default (void)
 {
-  return gdk_display_get_default_screen (default_display);
+  if (default_display)
+    return gdk_display_get_default_screen (default_display);
+  else
+    return NULL;
 }
 
 /**
  * gdk_display_manager_set_default_display:
+ * @display_manager: a #GdkDisplayManager
  * @display: a #GdkDisplay
  * 
  * Sets @display as the default display.
+ *
+ * Since: 2.2
  **/
 void
 gdk_display_manager_set_default_display (GdkDisplayManager *display_manager,
@@ -236,19 +260,25 @@ gdk_display_manager_set_default_display (GdkDisplayManager *display_manager,
 
   _gdk_windowing_set_default_display (display);
 
-  g_object_notify (G_OBJECT (display_manager), "default_display");
+  g_object_notify (G_OBJECT (display_manager), "default-display");
 }
 
 /**
  * gdk_display_manager_list_displays:
+ * @display_manager: a #GdkDisplayManager 
  *
  * List all currently open displays.
  * 
  * Return value: a newly allocated #GSList of #GdkDisplay objects.
  *  Free this list with g_slist_free() when you are done with it.
+ *
+ * Since: 2.2
  **/
 GSList *
 gdk_display_manager_list_displays (GdkDisplayManager *display_manager)
 {
   return g_slist_copy (_gdk_displays);
 }
+
+#define __GDK_DISPLAY_MANAGER_C__
+#include "gdkaliasdef.c"