Updated Spanish Translation

[empathy.git] / libempathy-gtk / empathy-geometry.c

diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c
index b549b8bad6db202a1a79e293dba62d15e76ac4b6..6874cd7966dd6c96c347e141e7beb0770fd7b654 100644 (file)
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -22,18 +22,16 @@
  */
 
 #include "config.h"
+#include "empathy-geometry.h"
 
 #include <sys/stat.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <glib.h>
-#include <gdk/gdk.h>
-
-#include "libempathy/empathy-utils.h"
-#include "empathy-geometry.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define GEOMETRY_DIR_CREATE_MODE  (S_IRUSR | S_IWUSR | S_IXUSR)
 #define GEOMETRY_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)
@@ -126,14 +124,15 @@ geometry_get_key_file (void)
   return key_file;
 }
 
-static void
-empathy_geometry_save (GtkWindow *window)
+void
+empathy_geometry_save_values (GtkWindow *window,
+    gint x,
+    gint y,
+    gint w,
+    gint h,
+    gboolean maximized)
 {
   GKeyFile *key_file;
-  GdkWindow *gdk_window;
-  GdkWindowState window_state;
-  gint x, y, w, h;
-  gboolean maximized;
   gchar *position_str = NULL;
   GHashTable *names;
   GHashTableIter iter;
@@ -144,16 +143,6 @@ empathy_geometry_save (GtkWindow *window)
   g_return_if_fail (GTK_IS_WINDOW (window));
   g_return_if_fail (names != NULL);
 
-  if (!gtk_widget_get_visible (GTK_WIDGET (window)))
-    return;
-
-  /* Get window geometry */
-  gtk_window_get_position (window, &x, &y);
-  gtk_window_get_size (window, &w, &h);
-  gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
-  window_state = gdk_window_get_state (gdk_window);
-  maximized = (window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
-
   /* Don't save off-screen positioning */
   if (!EMPATHY_RECT_IS_ON_SCREEN (x, y, w, h))
     return;
@@ -189,6 +178,30 @@ empathy_geometry_save (GtkWindow *window)
   g_free (position_str);
 }
 
+static void
+empathy_geometry_save (GtkWindow *window)
+{
+  GdkWindow *gdk_window;
+  GdkWindowState window_state;
+  gboolean maximized;
+  gint x, y, w, h;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  if (!gtk_widget_get_visible (GTK_WIDGET (window)))
+    return;
+
+  /* Get window geometry */
+  gtk_window_get_position (window, &x, &y);
+  gtk_window_get_size (window, &w, &h);
+
+  gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
+  window_state = gdk_window_get_state (gdk_window);
+  maximized = (window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+
+  empathy_geometry_save_values (window, x, y, w, h, maximized);
+}
+
 static void
 empathy_geometry_load (GtkWindow *window,
     const gchar *name)
@@ -199,7 +212,7 @@ empathy_geometry_load (GtkWindow *window,
   gboolean  maximized;
 
   g_return_if_fail (GTK_IS_WINDOW (window));
-  g_return_if_fail (!EMP_STR_EMPTY (name));
+  g_return_if_fail (!TPAW_STR_EMPTY (name));
 
   /* escape the name so that unwanted characters such as # are removed */
   escaped_name = g_uri_escape_string (name, NULL, TRUE);
@@ -282,7 +295,7 @@ empathy_geometry_bind (GtkWindow *window,
   gboolean connect_sigs = FALSE;
 
   g_return_if_fail (GTK_IS_WINDOW (window));
-  g_return_if_fail (!EMP_STR_EMPTY (name));
+  g_return_if_fail (!TPAW_STR_EMPTY (name));
 
   /* Check if this window is already bound */
   names = g_object_get_data (G_OBJECT (window), GEOMETRY_NAME_KEY);