*/
#include "config.h"
+#include "empathy-geometry.h"
#include <sys/stat.h>
+#include <tp-account-widgets/tpaw-utils.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)
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);
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);