summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-02-26 13:31:54 +0300
committerStefano Karapetsas <[email protected]>2015-03-15 18:58:51 +0100
commitdccdd8a292968073eae062a7b602a13e212a8dad (patch)
treec0d7cec3105fcbc9eda2cea67fbf427c33afe4a6
parent9ff3e1b03e0beae87a6a77451c738cc8f34ec7c8 (diff)
downloadmate-applets-dccdd8a292968073eae062a7b602a13e212a8dad.tar.bz2
mate-applets-dccdd8a292968073eae062a7b602a13e212a8dad.tar.xz
stickynotes: more small fixes
-rw-r--r--stickynotes/stickynotes_applet.c8
-rw-r--r--stickynotes/stickynotes_applet_callbacks.c44
2 files changed, 24 insertions, 28 deletions
diff --git a/stickynotes/stickynotes_applet.c b/stickynotes/stickynotes_applet.c
index eb50f36d..79085cad 100644
--- a/stickynotes/stickynotes_applet.c
+++ b/stickynotes/stickynotes_applet.c
@@ -170,10 +170,8 @@ stickynotes_applet_init (MatePanelApplet *mate_panel_applet)
stickynotes_applet_init_prefs();
/* Watch GSettings values */
- g_signal_connect (stickynotes->settings,
- "changed",
- G_CALLBACK (preferences_apply_cb),
- NULL);
+ g_signal_connect (stickynotes->settings, "changed",
+ G_CALLBACK (preferences_apply_cb), NULL);
/* Max height for large notes*/
stickynotes->max_height = 0.8*gdk_screen_get_height( gdk_screen_get_default() );
@@ -467,9 +465,9 @@ stickynotes_applet_update_prefs (void)
sys_font = g_settings_get_boolean (stickynotes->settings, "use-system-font");
sticky = g_settings_get_boolean (stickynotes->settings, "sticky");
force_default = g_settings_get_boolean (stickynotes->settings, "force-default");
- font_str = g_settings_get_string (stickynotes->settings, "default-font");
desktop_hide = g_settings_get_boolean (stickynotes->settings, "desktop-hide");
+ font_str = g_settings_get_string (stickynotes->settings, "default-font");
if (!font_str)
{
font_str = g_strdup ("Sans 10");
diff --git a/stickynotes/stickynotes_applet_callbacks.c b/stickynotes/stickynotes_applet_callbacks.c
index 2da02a32..8e5890db 100644
--- a/stickynotes/stickynotes_applet_callbacks.c
+++ b/stickynotes/stickynotes_applet_callbacks.c
@@ -86,8 +86,8 @@ stickynote_toggle_notes_visible ()
/* Applet Callback : Mouse button press on the applet. */
gboolean
applet_button_cb (GtkWidget *widget,
- GdkEventButton *event,
- StickyNotesApplet *applet)
+ GdkEventButton *event,
+ StickyNotesApplet *applet)
{
if (event->type == GDK_2BUTTON_PRESS)
{
@@ -106,8 +106,8 @@ applet_button_cb (GtkWidget *widget,
/* Applet Callback : Keypress on the applet. */
gboolean
applet_key_cb (GtkWidget *widget,
- GdkEventKey *event,
- StickyNotesApplet *applet)
+ GdkEventKey *event,
+ StickyNotesApplet *applet)
{
switch (event->keyval)
{
@@ -164,8 +164,9 @@ void install_check_click_on_desktop (void)
}
/* Access the desktop window. desktop_window is the root window for the
- * default screen, so we know using gdk_display_get_default() is correct. */
- window = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), desktop_window);
+ * default screen, so we know using gdk_display_get_default() is correct. */
+ window = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (),
+ desktop_window);
/* It may contain an atom to tell us which other window to monitor */
user_time_window = gdk_x11_get_xatom_by_name ("_NET_WM_USER_TIME_WINDOW");
@@ -180,20 +181,21 @@ void install_check_click_on_desktop (void)
gulong bytes;
/* We only use this extra property if the actual user-time property's missing */
- XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), desktop_window, user_time,
+ XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_window_get_display(window)), 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 */
- XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), desktop_window, user_time_window,
+ XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_window_get_display(window)), desktop_window, user_time_window,
0, 4, False, AnyPropertyType, &actual_type, &actual_format,
&nitems, &bytes, (unsigned char **)&data );
if (actual_type != None)
{
/* We have another window to monitor */
desktop_window = *data;
- window = gdk_x11_window_foreign_new_for_display (gdk_window_get_display (window), desktop_window);
+ window = gdk_x11_window_foreign_new_for_display (gdk_window_get_display (window),
+ desktop_window);
}
}
}
@@ -206,8 +208,6 @@ void install_check_click_on_desktop (void)
void applet_change_orient_cb(MatePanelApplet *mate_panel_applet, MatePanelAppletOrient orient, StickyNotesApplet *applet)
{
applet->panel_orient = orient;
-
- return;
}
/* Applet Callback : Resize the applet. */
@@ -245,15 +245,13 @@ void applet_destroy_cb (MatePanelApplet *mate_panel_applet, StickyNotesApplet *a
stickynotes->applets = g_list_remove (stickynotes->applets, applet);
if (stickynotes->applets == NULL) {
- notes = stickynotes->notes;
- while (notes) {
- StickyNote *note = notes->data;
- stickynote_free (note);
- notes = g_list_next (notes);
- }
+ notes = stickynotes->notes;
+ while (notes) {
+ StickyNote *note = notes->data;
+ stickynote_free (note);
+ notes = g_list_next (notes);
+ }
}
-
-
}
/* Destroy all response Callback: Callback for the destroy all dialog */
@@ -297,7 +295,7 @@ void menu_destroy_all_cb(GtkAction *action, StickyNotesApplet *applet)
if (applet->destroy_all_dialog != NULL) {
gtk_window_set_screen (GTK_WINDOW (applet->destroy_all_dialog),
- gtk_widget_get_screen (GTK_WIDGET (applet->w_applet)));
+ gtk_widget_get_screen (GTK_WIDGET (applet->w_applet)));
gtk_window_present (GTK_WINDOW (applet->destroy_all_dialog));
return;
@@ -308,11 +306,11 @@ void menu_destroy_all_cb(GtkAction *action, StickyNotesApplet *applet)
g_object_unref (builder);
g_signal_connect (applet->destroy_all_dialog, "response",
- G_CALLBACK (destroy_all_response_cb),
- applet);
+ G_CALLBACK (destroy_all_response_cb),
+ applet);
gtk_window_set_screen (GTK_WINDOW (applet->destroy_all_dialog),
- gtk_widget_get_screen (applet->w_applet));
+ gtk_widget_get_screen (applet->w_applet));
gtk_widget_show_all (applet->destroy_all_dialog);
}