summaryrefslogtreecommitdiff
path: root/stickynotes
diff options
context:
space:
mode:
Diffstat (limited to 'stickynotes')
-rw-r--r--stickynotes/stickynotes.c4
-rw-r--r--stickynotes/stickynotes_applet.h10
-rw-r--r--stickynotes/stickynotes_applet_callbacks.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/stickynotes/stickynotes.c b/stickynotes/stickynotes.c
index 367a4507..756fe125 100644
--- a/stickynotes/stickynotes.c
+++ b/stickynotes/stickynotes.c
@@ -839,7 +839,7 @@ stickynotes_save_now (void)
g_free(body);
}
- /* The XML file is $HOME/.mate2/stickynotes_applet, most probably */
+ /* The XML file is $HOME/.config/mate/stickynotes_applet, most probably */
{
gchar *file = g_strdup_printf("%s%s", g_get_home_dir(),
XML_PATH);
@@ -875,7 +875,7 @@ stickynotes_load (GdkScreen *screen)
GList *new_notes, *tmp1; /* Lists of StickyNote*'s */
GList *new_nodes; /* Lists of xmlNodePtr's */
int x, y, w, h;
- /* The XML file is $HOME/.mate2/stickynotes_applet, most probably */
+ /* The XML file is $HOME/.config/mate/stickynotes_applet, most probably */
{
gchar *file = g_strdup_printf("%s%s", g_get_home_dir(),
XML_PATH);
diff --git a/stickynotes/stickynotes_applet.h b/stickynotes/stickynotes_applet.h
index 023f6162..976aff54 100644
--- a/stickynotes/stickynotes_applet.h
+++ b/stickynotes/stickynotes_applet.h
@@ -30,7 +30,7 @@
#define MATECONF_PATH "/apps/stickynotes_applet"
#define BUILDER_PATH GTK_BUILDERDIR "/stickynotes.ui"
-#define XML_PATH "/.mate2/stickynotes_applet"
+#define XML_PATH "/.config/mate/stickynotes_applet"
#define ICON_PATH STICKYNOTES_ICONDIR
#define STICKYNOTES_STOCK_LOCKED "stickynotes-stock-locked"
@@ -42,7 +42,7 @@
/* Global Sticky Notes instance */
typedef struct
{
- GtkBuilder *builder;
+ GtkBuilder *builder;
GtkWidget *w_prefs; /* The prefs dialog */
GtkAdjustment *w_prefs_width;
@@ -58,7 +58,7 @@ typedef struct
GList *notes; /* Linked-List of all the sticky notes */
GList *applets; /* Linked-List of all the applets */
-
+
GdkPixbuf *icon_normal; /* Normal applet icon */
GdkPixbuf *icon_prelight; /* Prelighted applet icon */
@@ -85,7 +85,7 @@ typedef struct
GtkWidget *w_image; /* The applet icon */
GtkWidget *destroy_all_dialog; /* The applet it's destroy all dialog */
-
+
gboolean prelighted; /* Whether applet is prelighted */
gboolean pressed; /* Whether applet is pressed */
@@ -95,7 +95,7 @@ typedef struct
GtkActionGroup *action_group;
GtkWidget *menu_tip;
} StickyNotesApplet;
-
+
typedef enum
{
STICKYNOTES_NEW = 0,
diff --git a/stickynotes/stickynotes_applet_callbacks.c b/stickynotes/stickynotes_applet_callbacks.c
index 1369d74b..e1b9037c 100644
--- a/stickynotes/stickynotes_applet_callbacks.c
+++ b/stickynotes/stickynotes_applet_callbacks.c
@@ -181,13 +181,13 @@ void install_check_click_on_desktop (void)
Window *data;
/* We only use this extra property if the actual user-time property's missing */
- int status = XGetWindowProperty( GDK_DISPLAY(), desktop_window, user_time,
+ int status = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), desktop_window, user_time,
0, 4, False, AnyPropertyType, &actual_type, &actual_format,
&nitems, &bytes, (unsigned char **)&data );
if (actual_type == None)
{
/* No user-time property, so look for the user-time-window */
- status = XGetWindowProperty( GDK_DISPLAY(), desktop_window, user_time_window,
+ status = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), desktop_window, user_time_window,
0, 4, False, AnyPropertyType, &actual_type, &actual_format,
&nitems, &bytes, (unsigned char **)&data );
if (actual_type != None)