summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--applets/clock/clock-sunpos.c2
-rw-r--r--applets/clock/clock.c15
-rw-r--r--applets/fish/fish.c2
-rw-r--r--mate-panel/panel-menu-bar.c5
-rw-r--r--mate-panel/panel-run-dialog.c7
5 files changed, 28 insertions, 3 deletions
diff --git a/applets/clock/clock-sunpos.c b/applets/clock/clock-sunpos.c
index 7b3ee86a..4cca172f 100644
--- a/applets/clock/clock-sunpos.c
+++ b/applets/clock/clock-sunpos.c
@@ -52,7 +52,7 @@
/* Calculate number of days since 4713BC.
*/
static gdouble
-unix_time_to_julian_date (gint unix_time)
+unix_time_to_julian_date (gint64 unix_time)
{
return UNIX_EPOCH + (double) unix_time / (60 * 60 * 24);
}
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index bc01b290..2aff3878 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -822,6 +822,21 @@ destroy_clock (GtkWidget * widget, ClockData *cd)
cd->systz = NULL;
}
+ if (cd->clock_group) {
+ g_object_unref (cd->clock_group);
+ cd->clock_group = NULL;
+ }
+
+ if (cd->prefs_window) {
+ gtk_widget_destroy (cd->prefs_window);
+ cd->prefs_window = NULL;
+ }
+
+ if (cd->set_time_window) {
+ gtk_widget_destroy (cd->set_time_window);
+ cd->set_time_window = NULL;
+ }
+
if (cd->cities_store) {
g_object_unref (cd->cities_store);
cd->cities_store = NULL;
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index d70d250a..a72ff5e4 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -1181,7 +1181,7 @@ static void check_april_fools(FishApplet* fish)
} else if (tm->tm_mon == fools_month &&
tm->tm_mday == fools_day &&
tm->tm_hour >= fools_hour_start &&
- tm->tm_hour <= fools_hour_end) {
+ tm->tm_hour < fools_hour_end) {
fish->april_fools = TRUE;
update_pixmap (fish);
}
diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c
index b348ae48..f8bbcc2e 100644
--- a/mate-panel/panel-menu-bar.c
+++ b/mate-panel/panel-menu-bar.c
@@ -291,9 +291,14 @@ static void panel_menu_bar_finalize (GObject* object)
if (menubar->priv->settings != NULL)
{
+ g_signal_handlers_disconnect_by_func (menubar->priv->settings,
+ panel_menu_bar_update_visibility,
+ menubar);
g_object_unref (menubar->priv->settings);
menubar->priv->settings = NULL;
}
+
+ G_OBJECT_CLASS (panel_menu_bar_parent_class)->finalize (object);
}
static void panel_menu_bar_class_init(PanelMenuBarClass* klass)
diff --git a/mate-panel/panel-run-dialog.c b/mate-panel/panel-run-dialog.c
index 49c4e761..a98afc46 100644
--- a/mate-panel/panel-run-dialog.c
+++ b/mate-panel/panel-run-dialog.c
@@ -493,6 +493,8 @@ panel_run_dialog_execute (PanelRunDialog *dialog)
"cannot_convert_command_from_utf8", TRUE,
primary, error->message);
g_free (primary);
+ g_free (command);
+ g_free (disk);
g_error_free (error);
return;
@@ -2120,8 +2122,11 @@ panel_run_dialog_present (GdkScreen *screen,
GtkBuilder *gui;
accelerator_keys_to_tree_iter_map = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL);
- if (panel_lockdown_get_disable_command_line ())
+ if (panel_lockdown_get_disable_command_line ()) {
+ g_hash_table_destroy (accelerator_keys_to_tree_iter_map);
+ accelerator_keys_to_tree_iter_map = NULL;
return;
+ }
if (static_dialog) {
gtk_window_set_screen (GTK_WINDOW (static_dialog->run_dialog), screen);