Merge lp:~noskcaj/ubuntu/utopic/xfce4-timer-plugin/1.6.0 into lp:ubuntu/utopic/xfce4-timer-plugin

[Jackson Doak]

New upstream release

[Martin Pitt (pitti)]

Uploaded, thanks!

review: Approve

=== removed directory '.pc'
=== removed file '.pc/.quilt_patches'
--- .pc/.quilt_patches	2013-05-22 21:42:15 +0000
+++ .pc/.quilt_patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/patches

=== removed file '.pc/.quilt_series'
--- .pc/.quilt_series	2013-05-22 21:42:15 +0000
+++ .pc/.quilt_series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-series

=== removed file '.pc/.version'
--- .pc/.version	2010-04-10 21:12:05 +0000
+++ .pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed directory '.pc/01_improve-timer-stop.patch'
=== removed directory '.pc/01_improve-timer-stop.patch/src'
=== removed file '.pc/01_improve-timer-stop.patch/src/xfcetimer.c'
--- .pc/01_improve-timer-stop.patch/src/xfcetimer.c	2013-05-22 21:42:15 +0000
+++ .pc/01_improve-timer-stop.patch/src/xfcetimer.c	1970-01-01 00:00:00 +0000
@@ -1,1811 +0,0 @@
-/*
- *
- *  Copyright (C) 2005 Kemal Ilgar Eroglu <[e-mail]>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-
-#define 	UPDATE_INTERVAL 2000 			/* Countdown update period in 
-											milliseconds */
-#define PBAR_THICKNESS  10
-
-#define BORDER 8
-#define WIDGET_SPACING 2
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-#include <libxfce4util/libxfce4util.h>
-#ifdef HAVE_XFCE48
-#include <libxfce4ui/libxfce4ui.h>
-#include <libxfce4panel/libxfce4panel.h>
-#else
-#include <libxfcegui4/xfce_iconbutton.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxfcegui4/dialogs.h>
-#endif
-
-#include "xfcetimer.h"
-
-static void create_plugin_control (XfcePanelPlugin *plugin);
-
-static void start_stop_selected (GtkWidget* menuitem, gpointer
-                                        data);
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(create_plugin_control);
-
-void make_menu(plugin_data *pd);
-
-/**
- * This is the timeout function that
- * repeats the alarm.
-**/
-static gboolean repeat_alarm (gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  /* Don't repeat anymore */
-  if(pd->rem_repetitions == 0){
-
-    if(pd->timeout_command)
-        g_free(pd->timeout_command);
-    pd->timeout_command=NULL;
-    pd->alarm_repeating=FALSE;
-    //make_menu(pd);
-
-    return FALSE;
-
-
-  }
-
-  g_spawn_command_line_async (pd->timeout_command,NULL);
-  pd->rem_repetitions = pd->rem_repetitions -1 ;
-  return TRUE;
-}
-
-/**
- * Fills in the pd->liststore to create the treeview
- * in the options window. The second arguments indicates
- * the alarm whose row will be highlighted in the
- * treeview. If it is NULL, no action is taken.
-**/
-
-static void fill_liststore (plugin_data *pd, GList *selected) {
-	
-  GtkTreeIter iter;
-  GList *list;
-  alarm_t *alrm;
-	
-  if(pd->liststore)
-  	gtk_list_store_clear (pd->liststore);
-  	
-  list = pd->alarm_list;
-  
-  
-  while (list) {
-	
-	alrm = (alarm_t *) list->data;
-	
-	gtk_list_store_append (pd->liststore, &iter);
-	
-	gtk_list_store_set (pd->liststore, &iter, 0, list, 1, alrm->name, 2, alrm->info, 3, alrm->command,-1);
-	
-	/* We select the given row */
-	if (selected && list == selected)
-		gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree)),&iter);
-	
-	list = g_list_next (list);  
-	  
-  }
-}
-
-/**
- * This is the update function that updates the
- * tooltip, pbar and keeps track of elapsed time
-**/
-static gboolean update_function (gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-  gint elapsed_sec,remaining;
-  gchar *tiptext = NULL, *temp, *dialog_title, *dialog_message;
-  GtkWidget *dialog;
-
-  elapsed_sec=(gint)g_timer_elapsed(pd->timer,NULL);
-
-  /* If countdown is not over, update tooltip */
-  if(elapsed_sec < pd->timeout_period_in_sec){
-
-     remaining=pd->timeout_period_in_sec-elapsed_sec;
-
-     if(remaining>=3600)
-       tiptext = g_strdup_printf(_("%dh %dm %ds left"),remaining/3600, (remaining%3600)/60,
-            remaining%60);
-     else if (remaining>=60)
-       tiptext = g_strdup_printf(_("%dm %ds left"),remaining/60, remaining%60);
-     else
-       tiptext = g_strdup_printf(_("%ds left"),remaining);
-       
-     if(pd->is_paused) {
-       temp = g_strconcat(tiptext,_(" (Paused)"),NULL);
-       g_free (tiptext);
-       tiptext = temp;
-     }
-     gtk_progress_bar_set_fraction  (GTK_PROGRESS_BAR(pd->pbar),
-                    1.0-((gdouble)elapsed_sec)/pd->timeout_period_in_sec);
-
-     gtk_tooltips_set_tip(pd->tip,GTK_WIDGET(pd->base),tiptext,NULL);
-
-     g_free(tiptext);
-
-     return TRUE;
-
-  }
-
-  /* Countdown is over, stop timer and free resources */
-
-  if( (strlen(pd->timeout_command)==0) || !pd->nowin_if_alarm ) {
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),1);
-
-	/* Display the name of the alarm when the countdown ends */
-    dialog_message = g_strdup_printf(_("Beeep! :) \nTime is up for the alarm %s."), pd->active_timer_name);
-
-    dialog = gtk_message_dialog_new     (NULL,
-                                    GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
-                                    GTK_MESSAGE_WARNING,
-                                    GTK_BUTTONS_CLOSE,
-                                    dialog_message);
-
-    g_signal_connect_swapped (dialog, "response",
-                           G_CALLBACK (gtk_widget_destroy),
-                           dialog);
-    
-    dialog_title = g_strdup_printf("Xfce4 Timer Plugin: %s", pd->active_timer_name);                       
-    gtk_window_set_title ((GtkWindow *) dialog, dialog_title);  
-                        
-	g_free(dialog_title);
-	g_free(dialog_message);
-	
-    gtk_widget_show(dialog);
-  }
-
-  if(strlen(pd->timeout_command)>0) {
-
-    g_spawn_command_line_async (pd->timeout_command,NULL);
-
-    if(pd->repeat_alarm){
-        pd->alarm_repeating=TRUE;
-        pd->rem_repetitions=pd->repetitions;
-        if(pd->repeat_timeout!=0)
-            g_source_remove(pd->repeat_timeout);
-        pd->repeat_timeout = g_timeout_add(pd->repeat_interval*1000,repeat_alarm,pd);
-    }
-    else
-    {
-        if(pd->timeout_command)
-            g_free(pd->timeout_command);
-        pd->timeout_command=NULL;
-    }
-  }
-
-  if(pd->timer)
-     g_timer_destroy(pd->timer);
-  pd->timer=NULL;
-  
-  /* Disable tooltips, reset pbar */
-  gtk_tooltips_set_tip(pd->tip,GTK_WIDGET(pd->base),"",NULL);
-  gtk_tooltips_disable(pd->tip);
-  gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),0);
-    
-  pd->timeout=0;
-
-  pd->timer_on=FALSE;
-
-  //make_menu(pd);
-
-  /* This function won't be called again */
-  return FALSE;
-
-}
-
-/**
- * This is the callback function called when a timer
- * is selected in the popup menu
-**/
-
-//static void timer_selected (GtkWidget* menuitem, GdkEventButton *event, gpointer data){
-static void timer_selected (GtkWidget* menuitem, gpointer data){
-  GList *list = (GList *) data;
-  alarm_t *alrm;
-  plugin_data *pd;
-  GtkRadioMenuItem *rmi;
-
-  rmi = (GtkRadioMenuItem *) menuitem;
-
-  // We do this to get rid of the (irrelevant) "activate" signals
-  // emitted by the first radio check button in the pop-up
-  // menu when the menu is created and also by the (deactivated)
-  // previous selection when a new selection is made. Another workaround
-  // is to listen to the button_press_event but it does not capture
-  // the Enter key press on the menuitem.  
-  if(!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(rmi)))
-  	return;
-  
-  alrm = (alarm_t *) list->data;
-  pd = (plugin_data *) alrm->pd;
-
-  pd->selected = list;
-
-  /* start the timer if the option to do so on selecting is set */
-  if(pd->selecting_starts && !pd->timer_on)
-    start_stop_selected(menuitem,pd);  
-
-}
-
-/**
- * This is the callback function called when the
- * start/stop item is selected in the popup menu
-**/
-
-static void start_stop_selected (GtkWidget* menuitem, gpointer
-                                        data){
-
-  plugin_data *pd=(plugin_data *)data;
-  GSList *group=NULL;
-  gchar temp[8];
-  gint row_count,cur_h,cur_m,cur_s,time;
-  gint timeout_period;
-  gboolean is_cd;
-  GTimeVal timeval;
-  struct tm *current;
-  alarm_t *alrm;
-
-  /* If counting down, we stop the timer and free the resources */
-  if(pd->timer_on){
-
-    if(pd->timer)
-       g_timer_destroy(pd->timer);
-    if(pd->timeout)
-       g_source_remove(pd->timeout);
-    if(pd->timeout_command)
-       g_free(pd->timeout_command);
-    if(pd->active_timer_name)
-       g_free(pd->active_timer_name);
-
-    pd->timer = NULL;
-    pd->timeout_command = NULL;
-    pd->active_timer_name = NULL;
-    pd->timeout = 0;
-    pd->timer_on = FALSE;
-    pd->is_paused = FALSE;
-
-    /* Disable tooltips, reset pbar */
-    gtk_tooltips_set_tip(pd->tip,GTK_WIDGET(pd->base),"",NULL);
-    gtk_tooltips_disable(pd->tip);
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),0);
-
-    return;
-
-  }
-
-  /* If we're here then the timer is off, so we start it */
-
-  /* Empty timer list-> Nothing to do. pd->selected=0, though. */
-  if(pd->selected == NULL)
-    return;
-
-  alrm = (alarm_t *) pd->selected->data;
-  
-  /* Record the timer name */
-  if (pd->active_timer_name)
-	g_free(pd->active_timer_name);
-	
-  pd->active_timer_name = g_strdup(alrm->name); /* It's freed next time 
-  															or at exit */ 
-  if(pd->timeout_command)
-    g_free(pd->timeout_command);
-    
-  /* If an alarm command is set, it overrides the default (if any) */
-  if (strlen(alrm->command)>0)
-	pd->timeout_command = g_strdup(alrm->command); /* It's freed next 
-															time or at exit */
-  else if (pd->use_global_command)
-	pd->timeout_command = g_strdup (pd->global_command);
-  else
-	pd->timeout_command = g_strdup("");
-  
-  /* If it's a 24h type alarm, we find the difference with current time
-     Here 'time' is in minutes */
-  if(!alrm->iscountdown) {
-
-     g_get_current_time(&timeval);
-     current = localtime((time_t *)&timeval.tv_sec);
-     strftime(temp,7,"%H",current);
-     cur_h = atoi(temp);
-     strftime(temp,7,"%M",current);
-     cur_m = atoi(temp);
-     strftime(temp,7,"%S",current);
-     cur_s = atoi(temp);
-
-     timeout_period = (alrm->time)*60 - ((60*cur_h + cur_m)*60 + cur_s);
-
-     if(timeout_period <0)
-        timeout_period+= 24*60*60;
-        
-     pd->is_countdown = FALSE;
-
-  }
-  /* Else 'pd->selected->time' already gives the countdown period in seconds */
-  else {
-  
-	  pd->is_countdown = TRUE;
-      timeout_period = alrm->time;
-
-  }
-  pd->timeout_period_in_sec=timeout_period;
-
-  /* start the timer */
-  pd->timer=g_timer_new();
-  pd->timer_on=TRUE;
-
-  gtk_tooltips_set_tip(pd->tip, GTK_WIDGET(pd->base), alrm->info, NULL);
-  gtk_tooltips_enable(pd->tip);
-
-  g_timer_start(pd->timer);
-  pd->timeout = g_timeout_add(UPDATE_INTERVAL, update_function,pd);
-
-}
-
-static void pause_resume_selected (GtkWidget* menuitem, gpointer
-                                        data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-
-  /* If paused, we resume */
-  if(pd->is_paused){
-	
-	g_timer_continue(pd->timer);
-	pd->is_paused=FALSE;
-	
-  /* If we're here then the timer is runnig, so we pause */	
-  } else {
-  
-  pd->is_paused=TRUE;
-  g_timer_stop(pd->timer);
-  
-  }
-  
-  //make_menu(pd);
-
-}
-
-/**
- * Callback when "Stop the alarm" is selected in the popup menu
-**/
-
-static void stop_repeating_alarm (GtkWidget* menuitem, gpointer
-                                        data){
-   plugin_data *pd=(plugin_data *)data;
-
-   g_source_remove(pd->repeat_timeout);
-
-   pd->alarm_repeating=FALSE;
-
-   if(pd->timeout_command){
-    g_free(pd->timeout_command);
-    pd->timeout_command=NULL;
-   }
-
-   //make_menu(pd);
-
-}
-
-/**
- * Callback when clicking on pbar. Pops the menu up/down
-**/
-static void pbar_clicked (GtkWidget *pbar, GdkEventButton *event, gpointer data){
-
-    plugin_data *pd=(plugin_data *)data;
-
-    make_menu(pd);
-      
-    if(!pd->menu)
-      return;
-
-    if(event->button==1)
-      gtk_menu_popup (GTK_MENU(pd->menu),NULL,NULL,NULL,NULL,event->button,event->time);  
-    else
-      gtk_menu_popdown(GTK_MENU(pd->menu));
-
-}
-
-/**
- * This function generates the popup menu
-**/
-void make_menu(plugin_data *pd){
-
-  GSList *group = NULL;
-  GList *list = NULL;
-  alarm_t *alrm;
-  GtkWidget *menuitem, *to_be_activated;
-  gchar *itemtext;
-
-
-  /* Destroy the existing one */
-  if(pd->menu)
-    gtk_widget_destroy(pd->menu);
-
-  pd->menu=gtk_menu_new();
-  
-  /* If the alarm is paused, the only option is to resume or stop */
-  if (pd->is_paused) {
-      menuitem=gtk_menu_item_new_with_label(_("Resume timer"));
-
-      gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
-      g_signal_connect  (G_OBJECT(menuitem),"activate",
-                G_CALLBACK(pause_resume_selected),pd);
-      gtk_widget_show(menuitem);
-      
-      menuitem=gtk_menu_item_new_with_label(_("Stop timer"));
-
-      gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
-      g_signal_connect  (G_OBJECT(menuitem),"activate",
-                G_CALLBACK(start_stop_selected),pd);
-      gtk_widget_show(menuitem);      
-      gtk_widget_show(pd->menu);
-      return;	  
-  }
-
-  list = pd->alarm_list;
-
-  while (list){
-
-      /* Run through the list, read name and timer period info */
-
-	  alrm = (alarm_t *) list->data;
-
-      itemtext = g_strdup_printf("%s (%s)",alrm->name,alrm->info);
-      menuitem=gtk_radio_menu_item_new_with_label(group,itemtext);      
-      gtk_menu_shell_append(GTK_MENU_SHELL(pd->menu),menuitem);
-      /* The selected timer is always active */
-      if(list == pd->selected)
-        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),TRUE);       
-      /* others are disabled when timer or alarm is already running */
-      else if(pd->timer_on || pd->alarm_repeating)
-        gtk_widget_set_sensitive(GTK_WIDGET(menuitem),FALSE);
-
-      group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-      g_signal_connect  (G_OBJECT(menuitem),"activate",
-            G_CALLBACK(timer_selected),list);
-            
-      g_free(itemtext);
-
-      list = list->next;
- 
-  }
-
-  /* Horizontal line (empty item) */
-  menuitem=gtk_menu_item_new();
-  gtk_menu_shell_append(GTK_MENU_SHELL(pd->menu),menuitem);
-
-  /* Pause menu item */
-  if(pd->timer_on && !pd->is_paused && pd->is_countdown) {
-    menuitem=gtk_menu_item_new_with_label(_("Pause timer"));
-
-    gtk_menu_shell_append   (GTK_MENU_SHELL(pd->menu),menuitem);
-    g_signal_connect    (G_OBJECT(menuitem),"activate",
-            G_CALLBACK(pause_resume_selected),pd);
-
-
-  }
- 
-  /* Start/stop menu item */
-  if(!pd->alarm_repeating){
-      if(pd->timer_on)
-        menuitem=gtk_menu_item_new_with_label(_("Stop timer"));
-      else
-        menuitem=gtk_menu_item_new_with_label(_("Start timer"));
-
-      gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
-      g_signal_connect  (G_OBJECT(menuitem),"activate",
-                G_CALLBACK(start_stop_selected),pd);
-  }
-
-  /* Stop repeating alarm if so */
-  if(pd->alarm_repeating) {
-    menuitem=gtk_menu_item_new_with_label(_("Stop the alarm"));
-
-    gtk_menu_shell_append   (GTK_MENU_SHELL(pd->menu),menuitem);
-    g_signal_connect    (G_OBJECT(menuitem),"activate",
-            G_CALLBACK(stop_repeating_alarm),pd);
-  }  
-
-  gtk_widget_show_all(pd->menu);
-}
-
-
-/**
- * Callback to the OK button in the Add window
-**/
-static void ok_add(GtkButton *button, gpointer data){
-
-  alarm_data *adata = (alarm_data *)data;
-  alarm_t *newalarm;
-  GtkTreeIter iter;
-  gint t1,t2,t3,t;
-  gchar *timeinfo = NULL;
-
-  /* Add item to the alarm list and liststore */
-
-  newalarm = g_new0(alarm_t,1);
-  newalarm->name = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->name)));
-  newalarm->command = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->command)));
-  newalarm->iscountdown = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->
-                                    rb1));
-  newalarm->pd = (gpointer) adata->pd;
-                                    
-  adata->pd->alarm_list = g_list_append (adata->pd->alarm_list, newalarm);
-
-  gtk_list_store_append(adata->pd->liststore,&iter);
-
-  gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,
-            0,g_list_last(adata->pd->alarm_list),
-            1,newalarm->name,
-            3,newalarm->command,
-            -1);
-  /* Item count goes up by one */
-  adata->pd->count=adata->pd->count+1;
-
-  /* If the h-m-s format (countdown) was chosen, convert time to seconds,
-     save the choice into the list */
-  if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->rb1))){
-
-    t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timeh));
-    t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timem));
-    t3=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->times));
-    t=t1*3600+t2*60+t3;
-
-	
-    
-    if(t1>0)
-       timeinfo = g_strdup_printf(_("%dh %dm %ds"),t1,t2,t3);
-    else if(t2>0)
-       timeinfo = g_strdup_printf(_("%dm %ds"),t2,t3);
-    else
-       timeinfo = g_strdup_printf(_("%ds"),t3);
-
-    
-  }
-  else{ /* The 24h format (alarm at specified time). Save time in minutes */
-
-    t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_h));
-    t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_m));
-    t=t1*60+t2;
-    timeinfo = g_strdup_printf(_("At %02d:%02d"),t1,t2);
-
-  }
-
-  newalarm->time = t;
-  newalarm->info = timeinfo;
-  gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,2,timeinfo,-1);
-
-
-  /* Free resources */
-  gtk_widget_destroy(GTK_WIDGET(adata->window));
-
-  g_free(adata);
-}
-
-
-
-/**
- * Callback for OK button on Edit window. See ok_add for comments.
-**/
-static void ok_edit(GtkButton *button, gpointer data){
-
-  alarm_data *adata = (alarm_data *)data;
-  GtkTreeIter iter;
-  gint t1,t2,t3,t;
-  gchar *timeinfo = NULL;
-  GList *list;
-  alarm_t *alrm;
-  GtkTreeSelection *select;
-  GtkTreeModel *model;
-
-  select = gtk_tree_view_get_selection (GTK_TREE_VIEW (adata->pd->tree));
-
-  if (gtk_tree_selection_get_selected (select, &model, &iter))
-  {
-	  
-	 gtk_tree_model_get(GTK_TREE_MODEL(adata->pd->liststore), &iter, 0, &list,-1);
-	 alrm = (alarm_t *) list->data;
-	 
-	 alrm->name = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->name)));
-	 alrm->command = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->command)));
-	 alrm->iscountdown = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->
-                                    rb1));
-	 /* This should be unnecessary, but do it anyway */
-	 alrm->pd = (gpointer) adata->pd;
-	 
-     gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,
-            1,alrm->name,
-            3,alrm->command ,-1);
-            
-     if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->rb1))){
-
-        t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timeh));
-        t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timem));
-        t3=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->times));
-        t=t1*3600+t2*60+t3;
-        
-        if(t1>0)
-           timeinfo = g_strdup_printf(_("%dh %dm %ds"),t1,t2,t3);
-        else if(t2>0)
-           timeinfo = g_strdup_printf(_("%dm %ds"),t2,t3);
-        else
-           timeinfo = g_strdup_printf(_("%ds"),t3);
-
-        
-      }
-      else{
-
-        t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_h));
-        t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_m));
-        t=t1*60+t2;
-        timeinfo = g_strdup_printf(_("At %02d:%02d"),t1,t2);
-      }
-
-	  alrm->time = t;
-	  alrm->info = timeinfo;
-	  gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,2,timeinfo,-1);
-	  
-  }
-
-  //make_menu(adata->pd);
-
-  gtk_widget_destroy(GTK_WIDGET(adata->window));
-
-  g_free(adata);
-}
-
-
-
-/**
- * Callback for cancelling Add and Edit. Just closes the window :).
-**/
-static void cancel_add_edit(GtkButton *button, gpointer data){
-
-  alarm_data *adata=(alarm_data *)data;
-
-  gtk_widget_destroy(GTK_WIDGET(adata->window));
-
-  g_free(adata);
-
-}
-
-/**
- * Callback when first radio button in dialog has been selected.
- */
-static void alarmdialog_countdown_toggled (GtkButton *button, gpointer data)
-{
-  alarm_data *adata = (alarm_data *) data;
-  gboolean active;
-
-  active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
-  gtk_widget_set_sensitive(GTK_WIDGET(adata->timeh), active);
-  gtk_widget_set_sensitive(GTK_WIDGET(adata->timem), active);
-  gtk_widget_set_sensitive(GTK_WIDGET(adata->times), active);
-}
-
-/**
- * Callback when second radio button in dialog has been selected.
- */
-static void alarmdialog_alarmtime_toggled (GtkButton *button, gpointer data)
-{
-  alarm_data *adata = (alarm_data *) data;
-  gboolean active;
-
-  active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
-  gtk_widget_set_sensitive(GTK_WIDGET(adata->time_h), active);
-  gtk_widget_set_sensitive(GTK_WIDGET(adata->time_m), active);
-}
-
-/**
- * Callback to the Add button in options window.
- * Creates the Add window.
-**/
-static void add_edit_clicked (GtkButton *buttonn, gpointer data){
-
-  plugin_data *pd = (plugin_data *)data;
-
-  GtkWindow *parent_window;
-  GtkWindow *window;
-  GtkLabel *label;
-  GtkEntry *name,*command;
-  GtkSpinButton *timeh,*timem,*times,*time_h,*time_m;
-  GtkRadioButton *rb1,*rb2;
-  GtkWidget *hbox,*vbox,*button;
-  alarm_data *adata=g_new0(alarm_data,1);
-  gchar *nc; gboolean is_cd; gint time;
-  GtkTreeIter iter;
-  GtkTreeSelection *select;
-  GtkTreeModel *model;
-  GList *list;
-  alarm_t *alrm;
-
-  window = (GtkWindow *)gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
-  adata->window=window;
-  adata->pd=pd;
-
-  gtk_window_set_modal(GTK_WINDOW(window),TRUE);
-  parent_window = (GtkWindow *) gtk_widget_get_toplevel(GTK_WIDGET(buttonn));
-  if (gtk_widget_is_toplevel(GTK_WIDGET(parent_window)))
-      gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(parent_window));
-
-  vbox=gtk_vbox_new(FALSE, BORDER);
-  gtk_container_add(GTK_CONTAINER(window),vbox);
-  gtk_container_set_border_width(GTK_CONTAINER(window), BORDER);
-
-  /***********/
-  hbox=gtk_hbox_new(FALSE, BORDER);
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE, WIDGET_SPACING);
-
-  label = (GtkLabel *)gtk_label_new (_("Name:"));
-  name = (GtkEntry *) gtk_entry_new();
-  adata->name=name;
-
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,0);
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(name),TRUE,TRUE,0);
-
-  /**********/
-  rb1=(GtkRadioButton *)gtk_radio_button_new_with_label(NULL,_("Enter the countdown time"));
-  g_signal_connect(G_OBJECT(rb1), "toggled", G_CALLBACK(alarmdialog_countdown_toggled), adata);
-  rb2=(GtkRadioButton *)gtk_radio_button_new_with_label(gtk_radio_button_get_group
-                    (rb1),_("Enter the time of alarm (24h format)"));
-  g_signal_connect(G_OBJECT(rb2), "toggled", G_CALLBACK(alarmdialog_alarmtime_toggled), adata);
-  adata->rb1=rb1;
-
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(rb1),TRUE,TRUE,0);
-
-  hbox=gtk_hbox_new(FALSE,0);
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(hbox),TRUE,TRUE,0);
-
-  timeh = (GtkSpinButton *)gtk_spin_button_new_with_range(0,23,1);
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(timeh),FALSE,FALSE, WIDGET_SPACING);
-  adata->timeh=timeh;
-  label = (GtkLabel *)gtk_label_new (_("h  "));
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE, WIDGET_SPACING);
-  timem = (GtkSpinButton *)gtk_spin_button_new_with_range(0,59,1);
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(timem),FALSE,FALSE,WIDGET_SPACING);
-  adata->timem=timem;
-  label = (GtkLabel *)gtk_label_new (_("m  "));
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
-  times = (GtkSpinButton *)gtk_spin_button_new_with_range(0,59,1);
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(times),FALSE,FALSE,WIDGET_SPACING);
-  adata->times=times;
-  label = (GtkLabel *)gtk_label_new (_("s  "));
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
-
-  label = (GtkLabel *)gtk_label_new (_("or"));
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(label),TRUE,TRUE,BORDER);
-
-
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(rb2),TRUE,TRUE,0);
-
-  hbox=gtk_hbox_new(FALSE,WIDGET_SPACING);
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(hbox),TRUE,TRUE,0);
-
-  time_h = (GtkSpinButton *)gtk_spin_button_new_with_range(0,23,1);
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(time_h),FALSE,FALSE,0);
-  adata->time_h=time_h;
-  label = (GtkLabel *)gtk_label_new (":");
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
-  time_m = (GtkSpinButton *)gtk_spin_button_new_with_range(0,59,1);
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(time_m),FALSE,FALSE,WIDGET_SPACING);
-  adata->time_m=time_m;
-
-  /****************/
-
-  label = (GtkLabel *)gtk_label_new (_("Command to run:"));
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
-  command = (GtkEntry *)gtk_entry_new();
-  adata->command=command;
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(command),TRUE,TRUE,WIDGET_SPACING);
-
-  /****************/
-
-  //hbox=gtk_hbox_new(TRUE,0);
-  hbox = gtk_hbutton_box_new();
-  gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
-  gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbox), BORDER);
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,TRUE,TRUE,WIDGET_SPACING);
-  //gtk_container_set_border_width(GTK_CONTAINER(hbox), BORDER);
-
-  button=gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-  gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
-  g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(cancel_add_edit),adata);
-
-  button=gtk_button_new_from_stock(GTK_STOCK_OK);
-  gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
-  if(GTK_WIDGET(buttonn)==pd->buttonadd)
-     g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(ok_add),adata);
-  else
-     g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(ok_edit),adata);
-
-
-
-  /* If this is the add window, we're done */
-  if(GTK_WIDGET(buttonn)==pd->buttonadd) {
-    gtk_window_set_title(window,_("Add new alarm"));
-    gtk_widget_show_all(GTK_WIDGET(window));
-    alarmdialog_alarmtime_toggled(GTK_BUTTON(rb2), adata);
-    return;
-  }
-
-  /* Else fill the values in the boxes with the current choices */
-  select = gtk_tree_view_get_selection (GTK_TREE_VIEW (pd->tree));
-  /*gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);*/
-
-  if (gtk_tree_selection_get_selected (select, &model, &iter)){
-	  
-      gtk_tree_model_get(model,&iter,0,&list,-1);
-      alrm = (alarm_t *) list->data;
-      
-      gtk_entry_set_text(GTK_ENTRY(name),alrm->name);
-      gtk_entry_set_text(GTK_ENTRY(command),alrm->command);
-      
-      time = alrm->time;
-
-      if(alrm->iscountdown){
-
-         gtk_spin_button_set_value(GTK_SPIN_BUTTON(timeh),time/3600);
-         gtk_spin_button_set_value(GTK_SPIN_BUTTON(timem),(time%3600)/60);
-         gtk_spin_button_set_value(GTK_SPIN_BUTTON(times),time%60);
-         alarmdialog_alarmtime_toggled(GTK_BUTTON(rb2), adata);
-         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rb1),TRUE);
-      }
-      else{
-
-         gtk_spin_button_set_value(GTK_SPIN_BUTTON(time_h),time/60);
-         gtk_spin_button_set_value(GTK_SPIN_BUTTON(time_m),time%60);
-         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rb2),TRUE); // active by default
-      }
-
-  }
-
-  gtk_window_set_title(window,_("Edit alarm"));
-  gtk_widget_show_all(GTK_WIDGET(window));
-
-}
-
-
-/**
- * Calllback for the remove button in the options
-**/
-static void remove_clicked(GtkButton *button, gpointer data){
-
-  plugin_data *pd = (plugin_data *)data;
-
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  GtkTreeSelection *select;
-  GList *list;
-  
-  /* Get the selected row */
-  select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
-  
-  if (!select)
-  	return;
-
-  if (!gtk_tree_selection_get_selected (select, &model, &iter)) 
-  	return;
-
-  gtk_tree_model_get(model,&iter,0,&list,-1);
-  
-  if (pd->selected == list) {
-	  pd->alarm_list = g_list_delete_link (pd->alarm_list, list);
-	  pd->selected = pd->alarm_list;
-  } else {
-	  pd->alarm_list = g_list_delete_link (pd->alarm_list, list);
-  }
-  
-  fill_liststore (pd,NULL);
-
-}
-
-/**
- * Moves an alarm one row up in the list
-**/
-static void up_clicked(GtkButton *button, gpointer data){
-
-  plugin_data *pd = (plugin_data *)data;
-
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  GtkTreeSelection *select;
-  GList *list, *list_prev;
-
-  /* Get the selected row */
-  select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
-  
-  if (!select)
-  	return;
-
-  if (!gtk_tree_selection_get_selected (select, &model, &iter)) 
-  	return;
-
-  /* This is the item to be moved up */
-  gtk_tree_model_get(model,&iter,0,&list,-1);
-  
-  /* First item can't be moved up */
-  if(g_list_position(pd->alarm_list, list) <= 0)
-	return;
-
-  /* swap places */
-  list_prev = list->prev;
-  if(list_prev->prev)
-  	list_prev->prev->next = list;
-  if(list->next)
-  	list->next->prev = list_prev;
-  list_prev->next = list->next;
-  list->prev = list_prev->prev;
-  list->next = list_prev;
-  list_prev->prev = list;
-  
-  pd->alarm_list = g_list_first(list);
-  
-  fill_liststore (pd, list);
-}
-
-/**
- * Moves an alarm one row down in the list
-**/
-static void down_clicked(GtkButton *button, gpointer data){
-
-  plugin_data *pd = (plugin_data *)data;
-
-  GtkTreeIter iter;
-  GtkTreeSelection *select;
-  GtkTreeModel *model;
-  GList *list,*list_next;
-
-  /* Get the selected row */
-  select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
-  
-  if (!select)
-  	return;
-
-  if (!gtk_tree_selection_get_selected (select, &model, &iter)) 
-  	return;
-
-  /* This is the item to be moved down */
-  gtk_tree_model_get(model,&iter,0,&list,-1);
- 
-  /* Last item can't go down) */
-  if (list == g_list_last(pd->alarm_list))
-  	return;
-
-  /* swap places */
-  list_next = list->next;
-  if(list_next->next)
-  	list_next->next->prev = list;
-  if(list->prev)
-  	list->prev->next = list_next;
-  list_next->prev = list ->prev;
-  list->next = list_next->next;
-  list_next->next = list;
-  list->prev = list_next;
-  
-  pd->alarm_list = g_list_first(list_next);
-  
-  fill_liststore (pd, list);
-}
-
-
-/**
- * Adds the progressbar, taking into account the orientation.
- * pd->pbar is not destroyed, just reparented (saves fraction setting code etc.).
-**/
-static void add_pbar(XfcePanelPlugin *plugin, plugin_data *pd){
-
-  gdouble frac;
-
-  gtk_widget_hide(GTK_WIDGET(plugin));
-
-  /* Always true except at initialization */
-//  if(pd->box){
-    //g_object_ref(G_OBJECT(pd->pbar));
-//    gtk_container_remove(GTK_CONTAINER(pd->box),pd->pbar);
-//    gtk_widget_destroy(pd->box);
-//  }
-
-  if (pd -> box) {
-    frac = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (pd->pbar));
-    gtk_widget_destroy(pd->box);
-    pd->pbar = gtk_progress_bar_new ();
-    gtk_progress_bar_set_bar_style    (GTK_PROGRESS_BAR(pd->pbar),
-                    GTK_PROGRESS_CONTINUOUS);
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),frac);
-  }
-  
-  /* vertical bar */
-  if(xfce_panel_plugin_get_orientation(plugin)==GTK_ORIENTATION_HORIZONTAL){
-    pd->box=gtk_hbox_new(TRUE,0);
-  gtk_container_set_border_width (GTK_CONTAINER(pd->box), BORDER/2);
-#ifdef HAVE_XFCE48    
-    gtk_container_add(GTK_CONTAINER(plugin),pd->box);
-#else    
-    gtk_container_add(GTK_CONTAINER(pd->eventbox),pd->box);
-#endif
-    gtk_progress_bar_set_orientation    (GTK_PROGRESS_BAR(pd->
-                    pbar),GTK_PROGRESS_BOTTOM_TO_TOP);
-    gtk_widget_set_size_request(GTK_WIDGET(pd->pbar),PBAR_THICKNESS,0);
-    gtk_box_pack_start(GTK_BOX(pd->box),gtk_vseparator_new(),FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(pd->box),pd->pbar,FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(pd->box),gtk_vseparator_new(),FALSE,FALSE,0);
-
-  }
-  else{ /* horizontal bar */
-    pd->box=gtk_vbox_new(TRUE,0);
-    gtk_container_set_border_width (GTK_CONTAINER(pd->box), BORDER/2);
-#ifdef HAVE_XFCE48    
-    gtk_container_add(GTK_CONTAINER(plugin),pd->box);
-#else    
-    gtk_container_add(GTK_CONTAINER(pd->eventbox),pd->box);
-#endif
-    gtk_progress_bar_set_orientation    (GTK_PROGRESS_BAR(pd->
-                    pbar),GTK_PROGRESS_LEFT_TO_RIGHT);
-    gtk_widget_set_size_request(GTK_WIDGET(pd->pbar),0,PBAR_THICKNESS);
-    gtk_box_pack_start(GTK_BOX(pd->box),gtk_hseparator_new(),FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(pd->box),pd->pbar,FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(pd->box),gtk_hseparator_new(),FALSE,FALSE,0);
-
-  }
-
-  gtk_widget_show_all(GTK_WIDGET(plugin)); 
-
-}
-
-/**
- * Callback for orientation change of panel. Just calls add_pbar.
-**/
-static void orient_change(XfcePanelPlugin *plugin, GtkOrientation orient, plugin_data *pd){
-
-  add_pbar(plugin,pd);
-}
-
-/**
- * Loads the settings and alarm list from a keyfile, saves the
- * alarm list in the linked list pd->alarm_list 
-**/
-static void load_settings(plugin_data *pd)
-{
-
-  gchar groupname[8];
-  const gchar *timerstring;
-  gint groupnum,time;
-  gboolean is_cd;
-  alarm_t *alrm;
-  
-  XfceRc *rc;
-
-  //if ((file=xfce_panel_plugin_lookup_rc_file (pd->base)) != NULL) {
-
-
-      if (g_file_test(pd->configfile,G_FILE_TEST_EXISTS)) {
-
-          rc = xfce_rc_simple_open (pd->configfile, TRUE);
-
-
-          if (rc != NULL)
-          {
-
-
-          groupnum=0;
-          g_sprintf(groupname,"G0");
-
-
-          while(xfce_rc_has_group(rc,groupname)){
-
-             xfce_rc_set_group(rc,groupname);
-			
-             alrm = g_new0 (alarm_t,1);
-			 pd->alarm_list = g_list_append(pd->alarm_list, alrm);
-			 
-             timerstring=(gchar *)xfce_rc_read_entry(rc,"timername","No name");
-    		 alrm->name = g_strdup(timerstring);
-    		 
-             timerstring=(gchar *)xfce_rc_read_entry(rc,"timercommand","");
-			 alrm->command = g_strdup(timerstring);
-			 
-             timerstring=(gchar *)xfce_rc_read_entry(rc,"timerinfo","");
-             alrm->info = g_strdup(timerstring);
-
-             is_cd=xfce_rc_read_bool_entry(rc,"is_countdown",TRUE);
-             alrm->iscountdown = is_cd;
-             
-             time=xfce_rc_read_int_entry(rc,"time",0);
-			 alrm->time = time;
-			 
-			 /* Include a link to the whole data */
-			 alrm->pd = (gpointer) pd;
-			 
-             groupnum++;
-             g_snprintf(groupname,5,"G%d",groupnum);
-
-          } /* end of while loop */
-
-          pd->count=groupnum;
-
-
-          /* Read other options */
-          if(xfce_rc_has_group(rc,"others")){
-            xfce_rc_set_group(rc,"others");
-            pd->nowin_if_alarm= xfce_rc_read_bool_entry
-                (rc,"nowin_if_alarm",FALSE);
-            pd->selecting_starts= xfce_rc_read_bool_entry
-               (rc,"selecting_starts",FALSE);           
-            pd->use_global_command= xfce_rc_read_bool_entry
-               (rc,"use_global_command",FALSE); 
-               
-            if(pd->global_command) g_free(pd->global_command);
-            pd->global_command = g_strdup((gchar *)xfce_rc_read_entry
-               (rc,"global_command",""));
-                            
-            pd->repeat_alarm= xfce_rc_read_bool_entry
-                (rc,"repeat_alarm",FALSE);
-            pd->repetitions= xfce_rc_read_int_entry
-                (rc,"repetitions",1);
-            pd->repeat_interval= xfce_rc_read_int_entry
-                (rc,"repeat_interval",10);
-
-          }
-
-          add_pbar(pd->base,pd);
-
-             xfce_rc_close(rc);
-          }
-
-//   }
-  }
-
-}
-
-
-/**
- * Saves the list to a keyfile, backup a permanent copy
-**/
-static void save_settings(XfcePanelPlugin *plugin, plugin_data *pd){
-
-  gchar groupname[8];
-  gint row_count;
-  GList *list;
-  alarm_t *alrm;
-  FILE *conffile;
-  XfceRc *rc;
-  gchar *file, *contents=NULL;
-
-  if (!(file = xfce_panel_plugin_save_location (plugin, TRUE)))
-    return;
-
-  // We do this to start a fresh config file, otherwise if the old config file is longer,
-  // the tail will not get truncated. See
-  // http://bugzilla.xfce.org/show_bug.cgi?id=2647
-  // for a related bug report.
-  conffile = fopen(file,"w");
-  if (conffile)
-    fclose(conffile);
-
-  rc = xfce_rc_simple_open (file, FALSE);
-
-  if (!rc)
-    return;
-
-  list = pd->alarm_list;
-
-  row_count = 0;
-
-  while (list){
-
-      g_snprintf(groupname,7,"G%d",row_count);
-      
-      xfce_rc_set_group(rc,groupname);
-      
-      alrm = (alarm_t *) list->data;
-
-      xfce_rc_write_entry(rc,"timername",alrm->name);
-
-      xfce_rc_write_int_entry(rc,"time",alrm->time);
-
-      xfce_rc_write_entry(rc,"timercommand",alrm->command);
-
-      xfce_rc_write_entry(rc,"timerinfo",alrm->info);
-
-      xfce_rc_write_bool_entry(rc,"is_countdown",alrm->iscountdown);
-
-      row_count ++;
-      list = list->next;
-  }
-
-
-  /* save the other options */
-  xfce_rc_set_group(rc,"others");
-
-  xfce_rc_write_bool_entry(rc,"nowin_if_alarm",pd->nowin_if_alarm);
-  xfce_rc_write_bool_entry(rc,"selecting_starts",pd->selecting_starts);
-  xfce_rc_write_bool_entry(rc,"use_global_command",pd->use_global_command);
-  xfce_rc_write_entry(rc,"global_command",pd->global_command);
-  xfce_rc_write_bool_entry(rc,"repeat_alarm",pd->repeat_alarm);
-  xfce_rc_write_int_entry(rc,"repetitions",pd->repetitions);
-  xfce_rc_write_int_entry(rc,"repeat_interval",pd->repeat_interval);
-
-  xfce_rc_close(rc);
-
-  conffile = fopen (pd->configfile,"w");
-  /* We backup a permanent copy, which we'll use to load settings */
-  if (conffile && g_file_get_contents(file,&contents,NULL,NULL)){
-    fputs(contents,conffile);
-    fclose(conffile);
-  }
-
-  g_free(file);
-  if(contents)
-    g_free(contents);
-
-}
-
-
-/**
- * Activates the Edit and Remove buttons when an item in the list is selected
-**/
-
-static void tree_selected (GtkTreeSelection *select, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  gtk_widget_set_sensitive(pd->buttonedit,TRUE);
-  gtk_widget_set_sensitive(pd->buttonremove,TRUE);
-  gtk_widget_set_sensitive(pd->buttonup,TRUE);
-  gtk_widget_set_sensitive(pd->buttondown,TRUE);
-
-}
-
-
-/******************/
-/* plugin_free    */
-/******************/
-
-static void
-plugin_free (XfcePanelPlugin *plugin, plugin_data *pd)
-{
-
-  /* remove timeouts */
-  if (pd->timeout!=0) g_source_remove(pd->timeout);
-  if (pd->repeat_timeout!=0) g_source_remove(pd->repeat_timeout);
-
-  /*save_settings(pd);*/
-
-  if(pd->timer)
-    g_timer_destroy(pd->timer);
-    
-  if(pd->active_timer_name)
-    g_free(pd->active_timer_name);
-        
-  if(pd->timeout_command)
-    g_free(pd->timeout_command);
-
-  if(pd->global_command)
-    g_free(pd->global_command);
-
-  if(pd->configfile)
-    g_free(pd->configfile);
-    
-  if(pd->liststore) {
-	gtk_list_store_clear (pd->liststore);
-    //g_free (pd->liststore);
-  }
-  
-  if(pd->alarm_list)
-    g_list_free (pd->alarm_list);  
-
-  /* destroy the tooltips */
-  gtk_object_destroy(GTK_OBJECT(pd->tip));
-
-  /* destroy all widgets */
-#ifndef HAVE_XFCE48
-	gtk_widget_destroy(GTK_WIDGET(pd->eventbox));
-#endif  
-
-  /* free the plugin data structure */
-  g_free(pd);
-
-  gtk_main_quit();
-}
-
-/***************************/
-/* options dialog response */
-/***************************/
-static void
-options_dialog_response (GtkWidget *dlg, int reponse, plugin_data *pd)
-{
-	if(pd->global_command)
-		g_free(pd->global_command);
-	pd->global_command = g_strdup (gtk_entry_get_text((GtkEntry *)pd->glob_command_entry));
-    gtk_widget_destroy (dlg);
-    xfce_panel_plugin_unblock_menu (pd->base);
-    save_settings(pd->base,pd);
-}
-
-/**
- * nowin_if_alarm toggle callback
-**/
-static void toggle_nowin_if_alarm(GtkToggleButton *button, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  pd->nowin_if_alarm = gtk_toggle_button_get_active(button);
-
-}
-
-/**
- * selecting_starts toggle callback
-**/
-static void toggle_selecting_starts(GtkToggleButton *button, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  pd->selecting_starts = gtk_toggle_button_get_active(button);
-
-}
-/**
- * toggle_global_command toggle callback
-**/
-static void toggle_global_command(GtkToggleButton *button, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  pd->use_global_command = gtk_toggle_button_get_active(button);
-
-  gtk_widget_set_sensitive(pd->global_command_box,pd->use_global_command);
-
-}
-
-/**
- * toggle_repeat_alarm toggle callback
-**/
-static void toggle_repeat_alarm(GtkToggleButton *button, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  pd->repeat_alarm = gtk_toggle_button_get_active(button);
-
-  gtk_widget_set_sensitive(pd->repeat_alarm_box,pd->repeat_alarm);
-
-}
-
-/**
- * Spinbutton 1 (#of alarm repetitions
- * value change callback              
-**/
-static void spin1_changed(GtkSpinButton *button, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  pd->repetitions = gtk_spin_button_get_value_as_int(button);
-
-}
-
-/**
- * Spinbutton 1 (alarm repetition 
- * interval) value change callback 
-**/
-static void spin2_changed(GtkSpinButton *button, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  pd->repeat_interval = gtk_spin_button_get_value_as_int(button);
-
-}
-
-/**
- * options dialog
-**/
-static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
-
-  GtkWidget *vbox=gtk_vbox_new(FALSE,0); /*outermost box */
-  GtkWidget *hbox=gtk_hbox_new(FALSE,0); /* holds the treeview and buttons */
-  GtkWidget *buttonbox,*button,*sw,*tree,*spinbutton;
-  GtkTreeSelection *select;
-  GtkTreeViewColumn *column;
-  GtkWidget *dlg=NULL, *header=NULL;
-  GtkCellRenderer *renderer;
-
-
-  xfce_panel_plugin_block_menu (plugin);
-
-
-
-#ifdef HAVE_XFCE48
-  header = xfce_titled_dialog_new_with_buttons (_("Xfce4 Timer Options"), 
-                     GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
-                                               GTK_DIALOG_DESTROY_WITH_PARENT |
-                                               GTK_DIALOG_NO_SEPARATOR,
-                                               GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
-                                               NULL);
-
- dlg = header;                                               
-#else                                               
-  header = xfce_create_header (NULL, _("Xfce4 Timer Options"));
-  
-  dlg = gtk_dialog_new_with_buttons (_("Xfce 4 Timer Plugin"),
-              GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
-              GTK_DIALOG_DESTROY_WITH_PARENT |
-              GTK_DIALOG_NO_SEPARATOR,
-              GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
-              NULL);
-
-
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header,
-                      FALSE, TRUE, 0);    
-#endif  
-
-  g_signal_connect (dlg, "response", G_CALLBACK (options_dialog_response),
-                    pd);
-
-  gtk_container_set_border_width (GTK_CONTAINER(dlg), BORDER);
-
-  gtk_widget_set_size_request (dlg, 650, -1);
-  gtk_window_set_position(GTK_WINDOW(header),GTK_WIN_POS_CENTER);
-
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox,
-                      TRUE, TRUE, WIDGET_SPACING);
-
-
-  hbox = gtk_hbox_new(FALSE, BORDER);
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,TRUE,TRUE,BORDER);
-
-  sw = gtk_scrolled_window_new (NULL, NULL);
-
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                 GTK_POLICY_AUTOMATIC,
-                 GTK_POLICY_AUTOMATIC);
-
-  gtk_box_pack_start(GTK_BOX(hbox),sw,TRUE,TRUE,0);
-
-  fill_liststore (pd,NULL);
-      
-  tree=gtk_tree_view_new_with_model(GTK_TREE_MODEL(pd->liststore));
-  pd->tree=tree;
-  gtk_tree_view_set_rules_hint  (GTK_TREE_VIEW (tree), TRUE);
-  gtk_tree_selection_set_mode   (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree)),
-                 GTK_SELECTION_SINGLE);
-     
-  renderer = gtk_cell_renderer_text_new ();            
-  column = gtk_tree_view_column_new_with_attributes (_("Timer name"), renderer,
-                            "text", 1, NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
-
-
-  column = gtk_tree_view_column_new_with_attributes (_("Countdown period /\nAlarm time"),
-                            renderer, "text", 2, NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
-
-  column = gtk_tree_view_column_new_with_attributes (_("Alarm command"), renderer,
-                            "text", 3, NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
-
-
-  if(tree)
-     gtk_container_add(GTK_CONTAINER(sw),tree);
-
-  gtk_widget_set_size_request(GTK_WIDGET(sw),350,200);
-
-  select = gtk_tree_view_get_selection (GTK_TREE_VIEW (pd->tree));
-  gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
-  g_signal_connect  (G_OBJECT (select), "changed",
-            G_CALLBACK(tree_selected), pd);
-
-
-  buttonbox=gtk_vbutton_box_new();
-  gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox),GTK_BUTTONBOX_START);
-  gtk_button_box_set_spacing(GTK_BUTTON_BOX(buttonbox),WIDGET_SPACING<<1);
-  gtk_box_pack_start(GTK_BOX(hbox),buttonbox,FALSE,FALSE,0);
-
-  button = gtk_button_new_from_stock (GTK_STOCK_ADD);
-  pd->buttonadd=button;
-  gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING<<1);
-  gtk_widget_set_sensitive(button,TRUE);
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(add_edit_clicked), pd);
-
-
-  button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
-  pd->buttonedit=button;
-  gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING<<1);
-  gtk_widget_set_sensitive(button,FALSE);
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(add_edit_clicked), pd);
-
-  button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
-  pd->buttonremove=button;
-  gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING);
-  gtk_widget_set_sensitive(button,FALSE);
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(remove_clicked), pd);
-
-  button = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
-  pd->buttonup=button;
-  gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING);
-  gtk_widget_set_sensitive(button,FALSE);
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(up_clicked), pd);
-  
-  button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
-  pd->buttondown=button;
-  gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING);
-  gtk_widget_set_sensitive(button,FALSE);
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(down_clicked), pd);
-  
-  gtk_widget_set_size_request(hbox,-1,-1);
-  
-  gtk_box_pack_start(GTK_BOX(vbox),gtk_hseparator_new(),FALSE,FALSE,BORDER);
-
-  button=gtk_check_button_new_with_label(_("Don't display a warning  if an alarm command is set"));
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->nowin_if_alarm);
-  g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_nowin_if_alarm),pd);
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-
-  button=gtk_check_button_new_with_label(_("Selecting a timer starts it"));
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->selecting_starts);
-  g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_selecting_starts),pd);
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-
-  gtk_box_pack_start(GTK_BOX(vbox),gtk_hseparator_new(),FALSE,FALSE,BORDER);
-
-  /* Default alarm command config */
-  button=gtk_check_button_new_with_label(_("Use a default alarm command"));
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->use_global_command);
-  g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_global_command),pd);
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-
-  hbox = gtk_hbox_new (FALSE,0);
-  pd->global_command_box=hbox;
-  gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(_("Default command: ")),FALSE,FALSE,0);
-  pd->glob_command_entry = (GtkWidget *) gtk_entry_new();
-  gtk_widget_set_size_request(pd->glob_command_entry,400,-1);
-  gtk_entry_set_text(GTK_ENTRY(pd->glob_command_entry), pd->global_command);
-  gtk_box_pack_start(GTK_BOX(hbox),pd->glob_command_entry,FALSE,FALSE,10);
-
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,WIDGET_SPACING);
-  gtk_widget_set_sensitive(hbox,pd->use_global_command);
-  
-  gtk_box_pack_start(GTK_BOX(vbox),gtk_hseparator_new(),FALSE,FALSE,BORDER);
-  
-  /* Alarm repetitions config */  
-  button=gtk_check_button_new_with_label(_("Repeat the alarm command"));
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->repeat_alarm);
-  g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_repeat_alarm),pd);
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-  
-  hbox = gtk_hbox_new (FALSE,0);
-  pd->repeat_alarm_box=hbox;
-  gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(_("Number of repetitions")),FALSE,FALSE,0);
-  spinbutton=gtk_spin_button_new_with_range(1,50,1);
-  pd->spin_repeat=spinbutton;
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), pd->repetitions);
-  g_signal_connect(G_OBJECT(spinbutton),"value-changed", G_CALLBACK(spin1_changed), pd);
-  gtk_box_pack_start(GTK_BOX(hbox),spinbutton,FALSE,FALSE,10);
-  gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(_("  Time interval (sec.)")),FALSE,FALSE,0);
-  spinbutton=gtk_spin_button_new_with_range(1,600,1);
-  pd->spin_interval=spinbutton;
-  gtk_box_pack_start(GTK_BOX(hbox),spinbutton,FALSE,FALSE,10);
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), pd->repeat_interval);
-  g_signal_connect(G_OBJECT(spinbutton),"value-changed", G_CALLBACK(spin2_changed), pd);
-
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,WIDGET_SPACING);
-  gtk_widget_set_sensitive(hbox,pd->repeat_alarm);
-
-
-
-  gtk_widget_show_all(GTK_WIDGET(dlg));
-
-}
-
-/**
- * Show the "About" window
-**/
-static void show_about_window(XfcePanelPlugin *plugin, plugin_data *pd)
-{
-   GdkPixbuf *icon;
-   const gchar *author[] = { "Kemal Ilgar Eroğlu <[e-mail]>", NULL};
-   const gchar *translators = 
-"Mohammad Alhargan <[e-mail]> \n\
-Marcos Antonio Alvarez Costales <[e-mail]> \n\
-Harald Servat <[e-mail]> \n\
-Michal Várady <[e-mail]>\n\
-Per Kongstad <[e-mail]>\n\
-Simon Schneider <[e-mail]>\n\
-Efstathios Iosifidis <[e-mail]>\n\
-Jeff Bailes <[e-mail]>\n\
-Sergio <[e-mail]>\n\
-Piarres Beobide <[e-mail]>\n\
-Maximilian Schleiss <[e-mail]>\n\
-Leandro Regueiro <[e-mail]>\n\
-Ivica Kolić <[e-mail]>\n\
-Gabor Kelemen <kelemeng at gnome dot hu>\n\
-Andhika Padmawan <[e-mail]>\n\
-Cristian Marchi <[e-mail]>\n\
-Nobuhiro Iwamatsu <[e-mail]>\n\
-Seong-ho Cho <[e-mail]>\n\
-Rihards Priedītis <[e-mail]>\n\
-Pjotr <[e-mail]>\n\
-Piotr Sokół <[e-mail]>\n\
-Sérgio Marques <[e-mail]>\n\
-Rafael Ferreira <[e-mail]>\n\
-Dima Smirnov <[e-mail]>\n\
-Tomáš Vadina <[e-mail]>\n\
-Besnik Bleta <[e-mail]>\n\
-Саша Петровић <[e-mail]>\n\
-Daniel Nylander <[e-mail]>\n\
-Kemal Ilgar Eroğlu <[e-mail]>\n\
-Gheyret T.Kenji <[e-mail]>\n\
-Dmitry Nikitin <[e-mail]>\n\
-Muhammad Ali Makki <[e-mail]>\n\
-Hunt Xu <[e-mail]>\n\
-Cheng-Chia Tseng <[e-mail]>\n";
-	   
-   icon = xfce_panel_pixbuf_from_source("xfce4-timer", NULL, 48);
-   gtk_show_about_dialog(NULL,
-   	  "title", _("About xfce4-timer-plugin"),
-      "logo", icon,
-      "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL),
-      "version", PACKAGE_VERSION,
-      "program-name", PACKAGE_NAME,
-      "comments", _("A plugin to define countdown timers or alarms at given times."),
-      "website", "http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin",
-      "copyright", _("Copyright (c) 2005-2013\n"),
-      "authors", author,
-      "translator-credits" , translators,
-      NULL);
-
-   if(icon)
-      g_object_unref(G_OBJECT(icon));
-}
-
-/**
- * create_sample_control
- *
- * Create a new instance of the plugin.
- *
- * @control : #Control parent container
- *
- * Returns %TRUE on success, %FALSE on failure.
- **/
- 
-static void create_plugin_control (XfcePanelPlugin *plugin)
-{
-
-  GtkWidget *base,*menu,*socket,*menuitem,*box,*pbar2;
-  GtkTooltips *tooltip;
-  char command[1024];
-  gchar *filename,*pathname;
-
-  xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-
-  plugin_data *pd=g_new0(plugin_data,1);
-
-  pd->base=plugin;
-  pd->count=0;
-  pd->pbar=gtk_progress_bar_new();
-  pd->liststore=gtk_list_store_new(4,
-         G_TYPE_POINTER, /* Column 0: GList alarm list node */
-         G_TYPE_STRING,  /* Column 1: Name */
-         G_TYPE_STRING,  /* Column 2: Timer period/alarm time - info string */
-         G_TYPE_STRING);  /* Command to run */
-
-#ifndef HAVE_XFCE48
-  pd->eventbox = gtk_event_box_new();
-#endif  
-  pd->box=NULL;
-  pd->timer_on=FALSE;
-  pd->timeout=0;
-  pd->buttonadd=NULL;
-  pd->buttonedit=NULL;
-  pd->buttonremove=NULL;
-  pd->menu=NULL;
-  pd->tip=gtk_tooltips_new();
-  pd->timeout_command=NULL;
-  pd->timer=NULL;
-  pd->active_timer_name = g_strdup("");
-  pd->nowin_if_alarm=FALSE;
-  pd->selecting_starts=FALSE;
-  pd->repeat_alarm=FALSE;
-  pd->is_paused=FALSE;
-  pd->is_countdown=TRUE;
-  pd->use_global_command = FALSE;
-  pd->glob_command_entry = NULL;
-  pd->global_command = g_strdup(""); /* For Gtk >= 3.4 one could just set = NULL */
-  pd->global_command_box = NULL;  
-  pd->repeat_alarm_box=NULL;
-  pd->repetitions=1;
-  pd->rem_repetitions=1;
-  pd->repeat_interval=10;
-  pd->alarm_repeating=FALSE;
-  pd->repeat_timeout=0;
-  pd->alarm_list = NULL;
-  pd->selected=NULL;
-  
-  gtk_tooltips_set_tip(pd->tip, GTK_WIDGET(plugin), "", NULL);
-  gtk_tooltips_disable(pd->tip);
-
-
-  g_object_ref(pd->liststore);
-
-  filename = xfce_panel_plugin_save_location (pd->base,TRUE);
-  pathname = g_path_get_dirname (filename);
-  pd->configfile = g_strconcat (pathname,"/XfceTimer.rc",NULL);
-  g_free(filename);
-  g_free(pathname);
-
-  load_settings(pd);
-  pd->selected = pd->alarm_list;
-      
-  gtk_progress_bar_set_bar_style    (GTK_PROGRESS_BAR(pd->pbar),
-                    GTK_PROGRESS_CONTINUOUS);
-  gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),0);
-
-  add_pbar(pd->base,pd);
-
-  /* Trying to get a thin box, but no way */
-  gtk_widget_set_size_request(GTK_WIDGET(plugin),10,10);
-  xfce_panel_plugin_set_expand(plugin,FALSE);
-
-#ifdef HAVE_XFCE48
-  g_signal_connect  (G_OBJECT(plugin), "button_press_event",
-            G_CALLBACK(pbar_clicked), pd);   
-#else
-  gtk_container_add(GTK_CONTAINER(plugin),pd->eventbox);
-  g_signal_connect  (G_OBJECT(pd->eventbox), "button_press_event",
-            G_CALLBACK(pbar_clicked), pd);
-#endif  
-
-  gtk_widget_show_all(GTK_WIDGET(plugin));
-
-  g_signal_connect (plugin, "free-data",
-                      G_CALLBACK (plugin_free), pd);
-
-  g_signal_connect (plugin, "save",
-                      G_CALLBACK (save_settings), pd);
-
-  g_signal_connect (plugin, "orientation-changed",
-                      G_CALLBACK (orient_change), pd);
-
-  xfce_panel_plugin_menu_show_configure (plugin);
-  g_signal_connect (plugin, "configure-plugin",
-                      G_CALLBACK (plugin_create_options), pd);
-
-  xfce_panel_plugin_menu_show_about(plugin);
-  g_signal_connect (plugin, "about", G_CALLBACK (show_about_window), pd);                      
-                   
-}
-
-

=== removed directory '.pc/02_fix-format-string.patch'
=== removed directory '.pc/02_fix-format-string.patch/src'
=== removed file '.pc/02_fix-format-string.patch/src/xfcetimer.c'
--- .pc/02_fix-format-string.patch/src/xfcetimer.c	2013-05-22 21:42:15 +0000
+++ .pc/02_fix-format-string.patch/src/xfcetimer.c	1970-01-01 00:00:00 +0000
@@ -1,1813 +0,0 @@
-/*
- *
- *  Copyright (C) 2005 Kemal Ilgar Eroglu <[e-mail]>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-
-#define 	UPDATE_INTERVAL 2000 			/* Countdown update period in 
-											milliseconds */
-#define PBAR_THICKNESS  10
-
-#define BORDER 8
-#define WIDGET_SPACING 2
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-#include <libxfce4util/libxfce4util.h>
-#ifdef HAVE_XFCE48
-#include <libxfce4ui/libxfce4ui.h>
-#include <libxfce4panel/libxfce4panel.h>
-#else
-#include <libxfcegui4/xfce_iconbutton.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxfcegui4/dialogs.h>
-#endif
-
-#include "xfcetimer.h"
-
-static void create_plugin_control (XfcePanelPlugin *plugin);
-
-static void start_stop_selected (GtkWidget* menuitem, gpointer
-                                        data);
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(create_plugin_control);
-
-void make_menu(plugin_data *pd);
-
-/**
- * This is the timeout function that
- * repeats the alarm.
-**/
-static gboolean repeat_alarm (gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  /* Don't repeat anymore */
-  if(pd->rem_repetitions == 0){
-
-    if(pd->timeout_command)
-        g_free(pd->timeout_command);
-    pd->timeout_command=NULL;
-    pd->alarm_repeating=FALSE;
-    //make_menu(pd);
-
-    return FALSE;
-
-
-  }
-
-  g_spawn_command_line_async (pd->timeout_command,NULL);
-  pd->rem_repetitions = pd->rem_repetitions -1 ;
-  return TRUE;
-}
-
-/**
- * Fills in the pd->liststore to create the treeview
- * in the options window. The second arguments indicates
- * the alarm whose row will be highlighted in the
- * treeview. If it is NULL, no action is taken.
-**/
-
-static void fill_liststore (plugin_data *pd, GList *selected) {
-	
-  GtkTreeIter iter;
-  GList *list;
-  alarm_t *alrm;
-	
-  if(pd->liststore)
-  	gtk_list_store_clear (pd->liststore);
-  	
-  list = pd->alarm_list;
-  
-  
-  while (list) {
-	
-	alrm = (alarm_t *) list->data;
-	
-	gtk_list_store_append (pd->liststore, &iter);
-	
-	gtk_list_store_set (pd->liststore, &iter, 0, list, 1, alrm->name, 2, alrm->info, 3, alrm->command,-1);
-	
-	/* We select the given row */
-	if (selected && list == selected)
-		gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree)),&iter);
-	
-	list = g_list_next (list);  
-	  
-  }
-}
-
-/**
- * This is the update function that updates the
- * tooltip, pbar and keeps track of elapsed time
-**/
-static gboolean update_function (gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-  gint elapsed_sec,remaining;
-  gchar *tiptext = NULL, *temp, *dialog_title, *dialog_message;
-  GtkWidget *dialog;
-
-  elapsed_sec=(gint)g_timer_elapsed(pd->timer,NULL);
-
-  /* If countdown is not over, update tooltip */
-  if(elapsed_sec < pd->timeout_period_in_sec){
-
-     remaining=pd->timeout_period_in_sec-elapsed_sec;
-
-     if(remaining>=3600)
-       tiptext = g_strdup_printf(_("%dh %dm %ds left"),remaining/3600, (remaining%3600)/60,
-            remaining%60);
-     else if (remaining>=60)
-       tiptext = g_strdup_printf(_("%dm %ds left"),remaining/60, remaining%60);
-     else
-       tiptext = g_strdup_printf(_("%ds left"),remaining);
-       
-     if(pd->is_paused) {
-       temp = g_strconcat(tiptext,_(" (Paused)"),NULL);
-       g_free (tiptext);
-       tiptext = temp;
-     }
-     gtk_progress_bar_set_fraction  (GTK_PROGRESS_BAR(pd->pbar),
-                    1.0-((gdouble)elapsed_sec)/pd->timeout_period_in_sec);
-
-     gtk_tooltips_set_tip(pd->tip,GTK_WIDGET(pd->base),tiptext,NULL);
-
-     g_free(tiptext);
-
-     return TRUE;
-
-  }
-
-  /* Countdown is over, stop timer and free resources */
-  g_snprintf(tiptext,31,_("%ds left"),0);
-  gtk_tooltips_set_tip(pd->tip,GTK_WIDGET(pd->base),tiptext,NULL);
-
-  if( (strlen(pd->timeout_command)==0) || !pd->nowin_if_alarm ) {
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),1);
-
-	/* Display the name of the alarm when the countdown ends */
-    dialog_message = g_strdup_printf(_("Beeep! :) \nTime is up for the alarm %s."), pd->active_timer_name);
-
-    dialog = gtk_message_dialog_new     (NULL,
-                                    GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
-                                    GTK_MESSAGE_WARNING,
-                                    GTK_BUTTONS_CLOSE,
-                                    dialog_message);
-
-    g_signal_connect_swapped (dialog, "response",
-                           G_CALLBACK (gtk_widget_destroy),
-                           dialog);
-    
-    dialog_title = g_strdup_printf("Xfce4 Timer Plugin: %s", pd->active_timer_name);                       
-    gtk_window_set_title ((GtkWindow *) dialog, dialog_title);  
-                        
-	g_free(dialog_title);
-	g_free(dialog_message);
-	
-    gtk_widget_show(dialog);
-  }
-
-  if(strlen(pd->timeout_command)>0) {
-
-    g_spawn_command_line_async (pd->timeout_command,NULL);
-
-    if(pd->repeat_alarm){
-        pd->alarm_repeating=TRUE;
-        pd->rem_repetitions=pd->repetitions;
-        if(pd->repeat_timeout!=0)
-            g_source_remove(pd->repeat_timeout);
-        pd->repeat_timeout = g_timeout_add(pd->repeat_interval*1000,repeat_alarm,pd);
-    }
-    else
-    {
-        if(pd->timeout_command)
-            g_free(pd->timeout_command);
-        pd->timeout_command=NULL;
-    }
-  }
-
-  if(pd->timer)
-     g_timer_destroy(pd->timer);
-  pd->timer=NULL;
-  
-  /* Disable tooltips, reset pbar */
-  gtk_tooltips_set_tip(pd->tip,GTK_WIDGET(pd->base),"",NULL);
-  gtk_tooltips_disable(pd->tip);
-  gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),0);
-    
-  pd->timeout=0;
-
-  pd->timer_on=FALSE;
-
-  //make_menu(pd);
-
-  /* This function won't be called again */
-  return FALSE;
-
-}
-
-/**
- * This is the callback function called when a timer
- * is selected in the popup menu
-**/
-
-//static void timer_selected (GtkWidget* menuitem, GdkEventButton *event, gpointer data){
-static void timer_selected (GtkWidget* menuitem, gpointer data){
-  GList *list = (GList *) data;
-  alarm_t *alrm;
-  plugin_data *pd;
-  GtkRadioMenuItem *rmi;
-
-  rmi = (GtkRadioMenuItem *) menuitem;
-
-  // We do this to get rid of the (irrelevant) "activate" signals
-  // emitted by the first radio check button in the pop-up
-  // menu when the menu is created and also by the (deactivated)
-  // previous selection when a new selection is made. Another workaround
-  // is to listen to the button_press_event but it does not capture
-  // the Enter key press on the menuitem.  
-  if(!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(rmi)))
-  	return;
-  
-  alrm = (alarm_t *) list->data;
-  pd = (plugin_data *) alrm->pd;
-
-  pd->selected = list;
-
-  /* start the timer if the option to do so on selecting is set */
-  if(pd->selecting_starts && !pd->timer_on)
-    start_stop_selected(menuitem,pd);  
-
-}
-
-/**
- * This is the callback function called when the
- * start/stop item is selected in the popup menu
-**/
-
-static void start_stop_selected (GtkWidget* menuitem, gpointer
-                                        data){
-
-  plugin_data *pd=(plugin_data *)data;
-  GSList *group=NULL;
-  gchar temp[8];
-  gint row_count,cur_h,cur_m,cur_s,time;
-  gint timeout_period;
-  gboolean is_cd;
-  GTimeVal timeval;
-  struct tm *current;
-  alarm_t *alrm;
-
-  /* If counting down, we stop the timer and free the resources */
-  if(pd->timer_on){
-
-    if(pd->timer)
-       g_timer_destroy(pd->timer);
-    if(pd->timeout)
-       g_source_remove(pd->timeout);
-    if(pd->timeout_command)
-       g_free(pd->timeout_command);
-    if(pd->active_timer_name)
-       g_free(pd->active_timer_name);
-
-    pd->timer = NULL;
-    pd->timeout_command = NULL;
-    pd->active_timer_name = NULL;
-    pd->timeout = 0;
-    pd->timer_on = FALSE;
-    pd->is_paused = FALSE;
-
-    /* Disable tooltips, reset pbar */
-    gtk_tooltips_set_tip(pd->tip,GTK_WIDGET(pd->base),"",NULL);
-    gtk_tooltips_disable(pd->tip);
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),0);
-
-    return;
-
-  }
-
-  /* If we're here then the timer is off, so we start it */
-
-  /* Empty timer list-> Nothing to do. pd->selected=0, though. */
-  if(pd->selected == NULL)
-    return;
-
-  alrm = (alarm_t *) pd->selected->data;
-  
-  /* Record the timer name */
-  if (pd->active_timer_name)
-	g_free(pd->active_timer_name);
-	
-  pd->active_timer_name = g_strdup(alrm->name); /* It's freed next time 
-  															or at exit */ 
-  if(pd->timeout_command)
-    g_free(pd->timeout_command);
-    
-  /* If an alarm command is set, it overrides the default (if any) */
-  if (strlen(alrm->command)>0)
-	pd->timeout_command = g_strdup(alrm->command); /* It's freed next 
-															time or at exit */
-  else if (pd->use_global_command)
-	pd->timeout_command = g_strdup (pd->global_command);
-  else
-	pd->timeout_command = g_strdup("");
-  
-  /* If it's a 24h type alarm, we find the difference with current time
-     Here 'time' is in minutes */
-  if(!alrm->iscountdown) {
-
-     g_get_current_time(&timeval);
-     current = localtime((time_t *)&timeval.tv_sec);
-     strftime(temp,7,"%H",current);
-     cur_h = atoi(temp);
-     strftime(temp,7,"%M",current);
-     cur_m = atoi(temp);
-     strftime(temp,7,"%S",current);
-     cur_s = atoi(temp);
-
-     timeout_period = (alrm->time)*60 - ((60*cur_h + cur_m)*60 + cur_s);
-
-     if(timeout_period <0)
-        timeout_period+= 24*60*60;
-        
-     pd->is_countdown = FALSE;
-
-  }
-  /* Else 'pd->selected->time' already gives the countdown period in seconds */
-  else {
-  
-	  pd->is_countdown = TRUE;
-      timeout_period = alrm->time;
-
-  }
-  pd->timeout_period_in_sec=timeout_period;
-
-  /* start the timer */
-  pd->timer=g_timer_new();
-  pd->timer_on=TRUE;
-
-  gtk_tooltips_set_tip(pd->tip, GTK_WIDGET(pd->base), alrm->info, NULL);
-  gtk_tooltips_enable(pd->tip);
-
-  g_timer_start(pd->timer);
-  pd->timeout = g_timeout_add(UPDATE_INTERVAL, update_function,pd);
-
-}
-
-static void pause_resume_selected (GtkWidget* menuitem, gpointer
-                                        data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-
-  /* If paused, we resume */
-  if(pd->is_paused){
-	
-	g_timer_continue(pd->timer);
-	pd->is_paused=FALSE;
-	
-  /* If we're here then the timer is runnig, so we pause */	
-  } else {
-  
-  pd->is_paused=TRUE;
-  g_timer_stop(pd->timer);
-  
-  }
-  
-  //make_menu(pd);
-
-}
-
-/**
- * Callback when "Stop the alarm" is selected in the popup menu
-**/
-
-static void stop_repeating_alarm (GtkWidget* menuitem, gpointer
-                                        data){
-   plugin_data *pd=(plugin_data *)data;
-
-   g_source_remove(pd->repeat_timeout);
-
-   pd->alarm_repeating=FALSE;
-
-   if(pd->timeout_command){
-    g_free(pd->timeout_command);
-    pd->timeout_command=NULL;
-   }
-
-   //make_menu(pd);
-
-}
-
-/**
- * Callback when clicking on pbar. Pops the menu up/down
-**/
-static void pbar_clicked (GtkWidget *pbar, GdkEventButton *event, gpointer data){
-
-    plugin_data *pd=(plugin_data *)data;
-
-    make_menu(pd);
-      
-    if(!pd->menu)
-      return;
-
-    if(event->button==1)
-      gtk_menu_popup (GTK_MENU(pd->menu),NULL,NULL,NULL,NULL,event->button,event->time);  
-    else
-      gtk_menu_popdown(GTK_MENU(pd->menu));
-
-}
-
-/**
- * This function generates the popup menu
-**/
-void make_menu(plugin_data *pd){
-
-  GSList *group = NULL;
-  GList *list = NULL;
-  alarm_t *alrm;
-  GtkWidget *menuitem, *to_be_activated;
-  gchar *itemtext;
-
-
-  /* Destroy the existing one */
-  if(pd->menu)
-    gtk_widget_destroy(pd->menu);
-
-  pd->menu=gtk_menu_new();
-  
-  /* If the alarm is paused, the only option is to resume or stop */
-  if (pd->is_paused) {
-      menuitem=gtk_menu_item_new_with_label(_("Resume timer"));
-
-      gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
-      g_signal_connect  (G_OBJECT(menuitem),"activate",
-                G_CALLBACK(pause_resume_selected),pd);
-      gtk_widget_show(menuitem);
-      
-      menuitem=gtk_menu_item_new_with_label(_("Stop timer"));
-
-      gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
-      g_signal_connect  (G_OBJECT(menuitem),"activate",
-                G_CALLBACK(start_stop_selected),pd);
-      gtk_widget_show(menuitem);      
-      gtk_widget_show(pd->menu);
-      return;	  
-  }
-
-  list = pd->alarm_list;
-
-  while (list){
-
-      /* Run through the list, read name and timer period info */
-
-	  alrm = (alarm_t *) list->data;
-
-      itemtext = g_strdup_printf("%s (%s)",alrm->name,alrm->info);
-      menuitem=gtk_radio_menu_item_new_with_label(group,itemtext);      
-      gtk_menu_shell_append(GTK_MENU_SHELL(pd->menu),menuitem);
-      /* The selected timer is always active */
-      if(list == pd->selected)
-        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),TRUE);       
-      /* others are disabled when timer or alarm is already running */
-      else if(pd->timer_on || pd->alarm_repeating)
-        gtk_widget_set_sensitive(GTK_WIDGET(menuitem),FALSE);
-
-      group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-      g_signal_connect  (G_OBJECT(menuitem),"activate",
-            G_CALLBACK(timer_selected),list);
-            
-      g_free(itemtext);
-
-      list = list->next;
- 
-  }
-
-  /* Horizontal line (empty item) */
-  menuitem=gtk_menu_item_new();
-  gtk_menu_shell_append(GTK_MENU_SHELL(pd->menu),menuitem);
-
-  /* Pause menu item */
-  if(pd->timer_on && !pd->is_paused && pd->is_countdown) {
-    menuitem=gtk_menu_item_new_with_label(_("Pause timer"));
-
-    gtk_menu_shell_append   (GTK_MENU_SHELL(pd->menu),menuitem);
-    g_signal_connect    (G_OBJECT(menuitem),"activate",
-            G_CALLBACK(pause_resume_selected),pd);
-
-
-  }
- 
-  /* Start/stop menu item */
-  if(!pd->alarm_repeating){
-      if(pd->timer_on)
-        menuitem=gtk_menu_item_new_with_label(_("Stop timer"));
-      else
-        menuitem=gtk_menu_item_new_with_label(_("Start timer"));
-
-      gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
-      g_signal_connect  (G_OBJECT(menuitem),"activate",
-                G_CALLBACK(start_stop_selected),pd);
-  }
-
-  /* Stop repeating alarm if so */
-  if(pd->alarm_repeating) {
-    menuitem=gtk_menu_item_new_with_label(_("Stop the alarm"));
-
-    gtk_menu_shell_append   (GTK_MENU_SHELL(pd->menu),menuitem);
-    g_signal_connect    (G_OBJECT(menuitem),"activate",
-            G_CALLBACK(stop_repeating_alarm),pd);
-  }  
-
-  gtk_widget_show_all(pd->menu);
-}
-
-
-/**
- * Callback to the OK button in the Add window
-**/
-static void ok_add(GtkButton *button, gpointer data){
-
-  alarm_data *adata = (alarm_data *)data;
-  alarm_t *newalarm;
-  GtkTreeIter iter;
-  gint t1,t2,t3,t;
-  gchar *timeinfo = NULL;
-
-  /* Add item to the alarm list and liststore */
-
-  newalarm = g_new0(alarm_t,1);
-  newalarm->name = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->name)));
-  newalarm->command = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->command)));
-  newalarm->iscountdown = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->
-                                    rb1));
-  newalarm->pd = (gpointer) adata->pd;
-                                    
-  adata->pd->alarm_list = g_list_append (adata->pd->alarm_list, newalarm);
-
-  gtk_list_store_append(adata->pd->liststore,&iter);
-
-  gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,
-            0,g_list_last(adata->pd->alarm_list),
-            1,newalarm->name,
-            3,newalarm->command,
-            -1);
-  /* Item count goes up by one */
-  adata->pd->count=adata->pd->count+1;
-
-  /* If the h-m-s format (countdown) was chosen, convert time to seconds,
-     save the choice into the list */
-  if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->rb1))){
-
-    t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timeh));
-    t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timem));
-    t3=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->times));
-    t=t1*3600+t2*60+t3;
-
-	
-    
-    if(t1>0)
-       timeinfo = g_strdup_printf(_("%dh %dm %ds"),t1,t2,t3);
-    else if(t2>0)
-       timeinfo = g_strdup_printf(_("%dm %ds"),t2,t3);
-    else
-       timeinfo = g_strdup_printf(_("%ds"),t3);
-
-    
-  }
-  else{ /* The 24h format (alarm at specified time). Save time in minutes */
-
-    t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_h));
-    t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_m));
-    t=t1*60+t2;
-    timeinfo = g_strdup_printf(_("At %02d:%02d"),t1,t2);
-
-  }
-
-  newalarm->time = t;
-  newalarm->info = timeinfo;
-  gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,2,timeinfo,-1);
-
-
-  /* Free resources */
-  gtk_widget_destroy(GTK_WIDGET(adata->window));
-
-  g_free(adata);
-}
-
-
-
-/**
- * Callback for OK button on Edit window. See ok_add for comments.
-**/
-static void ok_edit(GtkButton *button, gpointer data){
-
-  alarm_data *adata = (alarm_data *)data;
-  GtkTreeIter iter;
-  gint t1,t2,t3,t;
-  gchar *timeinfo = NULL;
-  GList *list;
-  alarm_t *alrm;
-  GtkTreeSelection *select;
-  GtkTreeModel *model;
-
-  select = gtk_tree_view_get_selection (GTK_TREE_VIEW (adata->pd->tree));
-
-  if (gtk_tree_selection_get_selected (select, &model, &iter))
-  {
-	  
-	 gtk_tree_model_get(GTK_TREE_MODEL(adata->pd->liststore), &iter, 0, &list,-1);
-	 alrm = (alarm_t *) list->data;
-	 
-	 alrm->name = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->name)));
-	 alrm->command = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->command)));
-	 alrm->iscountdown = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->
-                                    rb1));
-	 /* This should be unnecessary, but do it anyway */
-	 alrm->pd = (gpointer) adata->pd;
-	 
-     gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,
-            1,alrm->name,
-            3,alrm->command ,-1);
-            
-     if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->rb1))){
-
-        t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timeh));
-        t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timem));
-        t3=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->times));
-        t=t1*3600+t2*60+t3;
-        
-        if(t1>0)
-           timeinfo = g_strdup_printf(_("%dh %dm %ds"),t1,t2,t3);
-        else if(t2>0)
-           timeinfo = g_strdup_printf(_("%dm %ds"),t2,t3);
-        else
-           timeinfo = g_strdup_printf(_("%ds"),t3);
-
-        
-      }
-      else{
-
-        t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_h));
-        t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_m));
-        t=t1*60+t2;
-        timeinfo = g_strdup_printf(_("At %02d:%02d"),t1,t2);
-      }
-
-	  alrm->time = t;
-	  alrm->info = timeinfo;
-	  gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,2,timeinfo,-1);
-	  
-  }
-
-  //make_menu(adata->pd);
-
-  gtk_widget_destroy(GTK_WIDGET(adata->window));
-
-  g_free(adata);
-}
-
-
-
-/**
- * Callback for cancelling Add and Edit. Just closes the window :).
-**/
-static void cancel_add_edit(GtkButton *button, gpointer data){
-
-  alarm_data *adata=(alarm_data *)data;
-
-  gtk_widget_destroy(GTK_WIDGET(adata->window));
-
-  g_free(adata);
-
-}
-
-/**
- * Callback when first radio button in dialog has been selected.
- */
-static void alarmdialog_countdown_toggled (GtkButton *button, gpointer data)
-{
-  alarm_data *adata = (alarm_data *) data;
-  gboolean active;
-
-  active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
-  gtk_widget_set_sensitive(GTK_WIDGET(adata->timeh), active);
-  gtk_widget_set_sensitive(GTK_WIDGET(adata->timem), active);
-  gtk_widget_set_sensitive(GTK_WIDGET(adata->times), active);
-}
-
-/**
- * Callback when second radio button in dialog has been selected.
- */
-static void alarmdialog_alarmtime_toggled (GtkButton *button, gpointer data)
-{
-  alarm_data *adata = (alarm_data *) data;
-  gboolean active;
-
-  active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
-  gtk_widget_set_sensitive(GTK_WIDGET(adata->time_h), active);
-  gtk_widget_set_sensitive(GTK_WIDGET(adata->time_m), active);
-}
-
-/**
- * Callback to the Add button in options window.
- * Creates the Add window.
-**/
-static void add_edit_clicked (GtkButton *buttonn, gpointer data){
-
-  plugin_data *pd = (plugin_data *)data;
-
-  GtkWindow *parent_window;
-  GtkWindow *window;
-  GtkLabel *label;
-  GtkEntry *name,*command;
-  GtkSpinButton *timeh,*timem,*times,*time_h,*time_m;
-  GtkRadioButton *rb1,*rb2;
-  GtkWidget *hbox,*vbox,*button;
-  alarm_data *adata=g_new0(alarm_data,1);
-  gchar *nc; gboolean is_cd; gint time;
-  GtkTreeIter iter;
-  GtkTreeSelection *select;
-  GtkTreeModel *model;
-  GList *list;
-  alarm_t *alrm;
-
-  window = (GtkWindow *)gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
-  adata->window=window;
-  adata->pd=pd;
-
-  gtk_window_set_modal(GTK_WINDOW(window),TRUE);
-  parent_window = (GtkWindow *) gtk_widget_get_toplevel(GTK_WIDGET(buttonn));
-  if (gtk_widget_is_toplevel(GTK_WIDGET(parent_window)))
-      gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(parent_window));
-
-  vbox=gtk_vbox_new(FALSE, BORDER);
-  gtk_container_add(GTK_CONTAINER(window),vbox);
-  gtk_container_set_border_width(GTK_CONTAINER(window), BORDER);
-
-  /***********/
-  hbox=gtk_hbox_new(FALSE, BORDER);
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE, WIDGET_SPACING);
-
-  label = (GtkLabel *)gtk_label_new (_("Name:"));
-  name = (GtkEntry *) gtk_entry_new();
-  adata->name=name;
-
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,0);
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(name),TRUE,TRUE,0);
-
-  /**********/
-  rb1=(GtkRadioButton *)gtk_radio_button_new_with_label(NULL,_("Enter the countdown time"));
-  g_signal_connect(G_OBJECT(rb1), "toggled", G_CALLBACK(alarmdialog_countdown_toggled), adata);
-  rb2=(GtkRadioButton *)gtk_radio_button_new_with_label(gtk_radio_button_get_group
-                    (rb1),_("Enter the time of alarm (24h format)"));
-  g_signal_connect(G_OBJECT(rb2), "toggled", G_CALLBACK(alarmdialog_alarmtime_toggled), adata);
-  adata->rb1=rb1;
-
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(rb1),TRUE,TRUE,0);
-
-  hbox=gtk_hbox_new(FALSE,0);
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(hbox),TRUE,TRUE,0);
-
-  timeh = (GtkSpinButton *)gtk_spin_button_new_with_range(0,23,1);
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(timeh),FALSE,FALSE, WIDGET_SPACING);
-  adata->timeh=timeh;
-  label = (GtkLabel *)gtk_label_new (_("h  "));
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE, WIDGET_SPACING);
-  timem = (GtkSpinButton *)gtk_spin_button_new_with_range(0,59,1);
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(timem),FALSE,FALSE,WIDGET_SPACING);
-  adata->timem=timem;
-  label = (GtkLabel *)gtk_label_new (_("m  "));
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
-  times = (GtkSpinButton *)gtk_spin_button_new_with_range(0,59,1);
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(times),FALSE,FALSE,WIDGET_SPACING);
-  adata->times=times;
-  label = (GtkLabel *)gtk_label_new (_("s  "));
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
-
-  label = (GtkLabel *)gtk_label_new (_("or"));
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(label),TRUE,TRUE,BORDER);
-
-
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(rb2),TRUE,TRUE,0);
-
-  hbox=gtk_hbox_new(FALSE,WIDGET_SPACING);
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(hbox),TRUE,TRUE,0);
-
-  time_h = (GtkSpinButton *)gtk_spin_button_new_with_range(0,23,1);
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(time_h),FALSE,FALSE,0);
-  adata->time_h=time_h;
-  label = (GtkLabel *)gtk_label_new (":");
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
-  time_m = (GtkSpinButton *)gtk_spin_button_new_with_range(0,59,1);
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(time_m),FALSE,FALSE,WIDGET_SPACING);
-  adata->time_m=time_m;
-
-  /****************/
-
-  label = (GtkLabel *)gtk_label_new (_("Command to run:"));
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
-  command = (GtkEntry *)gtk_entry_new();
-  adata->command=command;
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(command),TRUE,TRUE,WIDGET_SPACING);
-
-  /****************/
-
-  //hbox=gtk_hbox_new(TRUE,0);
-  hbox = gtk_hbutton_box_new();
-  gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
-  gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbox), BORDER);
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,TRUE,TRUE,WIDGET_SPACING);
-  //gtk_container_set_border_width(GTK_CONTAINER(hbox), BORDER);
-
-  button=gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-  gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
-  g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(cancel_add_edit),adata);
-
-  button=gtk_button_new_from_stock(GTK_STOCK_OK);
-  gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
-  if(GTK_WIDGET(buttonn)==pd->buttonadd)
-     g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(ok_add),adata);
-  else
-     g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(ok_edit),adata);
-
-
-
-  /* If this is the add window, we're done */
-  if(GTK_WIDGET(buttonn)==pd->buttonadd) {
-    gtk_window_set_title(window,_("Add new alarm"));
-    gtk_widget_show_all(GTK_WIDGET(window));
-    alarmdialog_alarmtime_toggled(GTK_BUTTON(rb2), adata);
-    return;
-  }
-
-  /* Else fill the values in the boxes with the current choices */
-  select = gtk_tree_view_get_selection (GTK_TREE_VIEW (pd->tree));
-  /*gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);*/
-
-  if (gtk_tree_selection_get_selected (select, &model, &iter)){
-	  
-      gtk_tree_model_get(model,&iter,0,&list,-1);
-      alrm = (alarm_t *) list->data;
-      
-      gtk_entry_set_text(GTK_ENTRY(name),alrm->name);
-      gtk_entry_set_text(GTK_ENTRY(command),alrm->command);
-      
-      time = alrm->time;
-
-      if(alrm->iscountdown){
-
-         gtk_spin_button_set_value(GTK_SPIN_BUTTON(timeh),time/3600);
-         gtk_spin_button_set_value(GTK_SPIN_BUTTON(timem),(time%3600)/60);
-         gtk_spin_button_set_value(GTK_SPIN_BUTTON(times),time%60);
-         alarmdialog_alarmtime_toggled(GTK_BUTTON(rb2), adata);
-         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rb1),TRUE);
-      }
-      else{
-
-         gtk_spin_button_set_value(GTK_SPIN_BUTTON(time_h),time/60);
-         gtk_spin_button_set_value(GTK_SPIN_BUTTON(time_m),time%60);
-         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rb2),TRUE); // active by default
-      }
-
-  }
-
-  gtk_window_set_title(window,_("Edit alarm"));
-  gtk_widget_show_all(GTK_WIDGET(window));
-
-}
-
-
-/**
- * Calllback for the remove button in the options
-**/
-static void remove_clicked(GtkButton *button, gpointer data){
-
-  plugin_data *pd = (plugin_data *)data;
-
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  GtkTreeSelection *select;
-  GList *list;
-  
-  /* Get the selected row */
-  select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
-  
-  if (!select)
-  	return;
-
-  if (!gtk_tree_selection_get_selected (select, &model, &iter)) 
-  	return;
-
-  gtk_tree_model_get(model,&iter,0,&list,-1);
-  
-  if (pd->selected == list) {
-	  pd->alarm_list = g_list_delete_link (pd->alarm_list, list);
-	  pd->selected = pd->alarm_list;
-  } else {
-	  pd->alarm_list = g_list_delete_link (pd->alarm_list, list);
-  }
-  
-  fill_liststore (pd,NULL);
-
-}
-
-/**
- * Moves an alarm one row up in the list
-**/
-static void up_clicked(GtkButton *button, gpointer data){
-
-  plugin_data *pd = (plugin_data *)data;
-
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  GtkTreeSelection *select;
-  GList *list, *list_prev;
-
-  /* Get the selected row */
-  select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
-  
-  if (!select)
-  	return;
-
-  if (!gtk_tree_selection_get_selected (select, &model, &iter)) 
-  	return;
-
-  /* This is the item to be moved up */
-  gtk_tree_model_get(model,&iter,0,&list,-1);
-  
-  /* First item can't be moved up */
-  if(g_list_position(pd->alarm_list, list) <= 0)
-	return;
-
-  /* swap places */
-  list_prev = list->prev;
-  if(list_prev->prev)
-  	list_prev->prev->next = list;
-  if(list->next)
-  	list->next->prev = list_prev;
-  list_prev->next = list->next;
-  list->prev = list_prev->prev;
-  list->next = list_prev;
-  list_prev->prev = list;
-  
-  pd->alarm_list = g_list_first(list);
-  
-  fill_liststore (pd, list);
-}
-
-/**
- * Moves an alarm one row down in the list
-**/
-static void down_clicked(GtkButton *button, gpointer data){
-
-  plugin_data *pd = (plugin_data *)data;
-
-  GtkTreeIter iter;
-  GtkTreeSelection *select;
-  GtkTreeModel *model;
-  GList *list,*list_next;
-
-  /* Get the selected row */
-  select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
-  
-  if (!select)
-  	return;
-
-  if (!gtk_tree_selection_get_selected (select, &model, &iter)) 
-  	return;
-
-  /* This is the item to be moved down */
-  gtk_tree_model_get(model,&iter,0,&list,-1);
- 
-  /* Last item can't go down) */
-  if (list == g_list_last(pd->alarm_list))
-  	return;
-
-  /* swap places */
-  list_next = list->next;
-  if(list_next->next)
-  	list_next->next->prev = list;
-  if(list->prev)
-  	list->prev->next = list_next;
-  list_next->prev = list ->prev;
-  list->next = list_next->next;
-  list_next->next = list;
-  list->prev = list_next;
-  
-  pd->alarm_list = g_list_first(list_next);
-  
-  fill_liststore (pd, list);
-}
-
-
-/**
- * Adds the progressbar, taking into account the orientation.
- * pd->pbar is not destroyed, just reparented (saves fraction setting code etc.).
-**/
-static void add_pbar(XfcePanelPlugin *plugin, plugin_data *pd){
-
-  gdouble frac;
-
-  gtk_widget_hide(GTK_WIDGET(plugin));
-
-  /* Always true except at initialization */
-//  if(pd->box){
-    //g_object_ref(G_OBJECT(pd->pbar));
-//    gtk_container_remove(GTK_CONTAINER(pd->box),pd->pbar);
-//    gtk_widget_destroy(pd->box);
-//  }
-
-  if (pd -> box) {
-    frac = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (pd->pbar));
-    gtk_widget_destroy(pd->box);
-    pd->pbar = gtk_progress_bar_new ();
-    gtk_progress_bar_set_bar_style    (GTK_PROGRESS_BAR(pd->pbar),
-                    GTK_PROGRESS_CONTINUOUS);
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),frac);
-  }
-  
-  /* vertical bar */
-  if(xfce_panel_plugin_get_orientation(plugin)==GTK_ORIENTATION_HORIZONTAL){
-    pd->box=gtk_hbox_new(TRUE,0);
-  gtk_container_set_border_width (GTK_CONTAINER(pd->box), BORDER/2);
-#ifdef HAVE_XFCE48    
-    gtk_container_add(GTK_CONTAINER(plugin),pd->box);
-#else    
-    gtk_container_add(GTK_CONTAINER(pd->eventbox),pd->box);
-#endif
-    gtk_progress_bar_set_orientation    (GTK_PROGRESS_BAR(pd->
-                    pbar),GTK_PROGRESS_BOTTOM_TO_TOP);
-    gtk_widget_set_size_request(GTK_WIDGET(pd->pbar),PBAR_THICKNESS,0);
-    gtk_box_pack_start(GTK_BOX(pd->box),gtk_vseparator_new(),FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(pd->box),pd->pbar,FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(pd->box),gtk_vseparator_new(),FALSE,FALSE,0);
-
-  }
-  else{ /* horizontal bar */
-    pd->box=gtk_vbox_new(TRUE,0);
-    gtk_container_set_border_width (GTK_CONTAINER(pd->box), BORDER/2);
-#ifdef HAVE_XFCE48    
-    gtk_container_add(GTK_CONTAINER(plugin),pd->box);
-#else    
-    gtk_container_add(GTK_CONTAINER(pd->eventbox),pd->box);
-#endif
-    gtk_progress_bar_set_orientation    (GTK_PROGRESS_BAR(pd->
-                    pbar),GTK_PROGRESS_LEFT_TO_RIGHT);
-    gtk_widget_set_size_request(GTK_WIDGET(pd->pbar),0,PBAR_THICKNESS);
-    gtk_box_pack_start(GTK_BOX(pd->box),gtk_hseparator_new(),FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(pd->box),pd->pbar,FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(pd->box),gtk_hseparator_new(),FALSE,FALSE,0);
-
-  }
-
-  gtk_widget_show_all(GTK_WIDGET(plugin)); 
-
-}
-
-/**
- * Callback for orientation change of panel. Just calls add_pbar.
-**/
-static void orient_change(XfcePanelPlugin *plugin, GtkOrientation orient, plugin_data *pd){
-
-  add_pbar(plugin,pd);
-}
-
-/**
- * Loads the settings and alarm list from a keyfile, saves the
- * alarm list in the linked list pd->alarm_list 
-**/
-static void load_settings(plugin_data *pd)
-{
-
-  gchar groupname[8];
-  const gchar *timerstring;
-  gint groupnum,time;
-  gboolean is_cd;
-  alarm_t *alrm;
-  
-  XfceRc *rc;
-
-  //if ((file=xfce_panel_plugin_lookup_rc_file (pd->base)) != NULL) {
-
-
-      if (g_file_test(pd->configfile,G_FILE_TEST_EXISTS)) {
-
-          rc = xfce_rc_simple_open (pd->configfile, TRUE);
-
-
-          if (rc != NULL)
-          {
-
-
-          groupnum=0;
-          g_sprintf(groupname,"G0");
-
-
-          while(xfce_rc_has_group(rc,groupname)){
-
-             xfce_rc_set_group(rc,groupname);
-			
-             alrm = g_new0 (alarm_t,1);
-			 pd->alarm_list = g_list_append(pd->alarm_list, alrm);
-			 
-             timerstring=(gchar *)xfce_rc_read_entry(rc,"timername","No name");
-    		 alrm->name = g_strdup(timerstring);
-    		 
-             timerstring=(gchar *)xfce_rc_read_entry(rc,"timercommand","");
-			 alrm->command = g_strdup(timerstring);
-			 
-             timerstring=(gchar *)xfce_rc_read_entry(rc,"timerinfo","");
-             alrm->info = g_strdup(timerstring);
-
-             is_cd=xfce_rc_read_bool_entry(rc,"is_countdown",TRUE);
-             alrm->iscountdown = is_cd;
-             
-             time=xfce_rc_read_int_entry(rc,"time",0);
-			 alrm->time = time;
-			 
-			 /* Include a link to the whole data */
-			 alrm->pd = (gpointer) pd;
-			 
-             groupnum++;
-             g_snprintf(groupname,5,"G%d",groupnum);
-
-          } /* end of while loop */
-
-          pd->count=groupnum;
-
-
-          /* Read other options */
-          if(xfce_rc_has_group(rc,"others")){
-            xfce_rc_set_group(rc,"others");
-            pd->nowin_if_alarm= xfce_rc_read_bool_entry
-                (rc,"nowin_if_alarm",FALSE);
-            pd->selecting_starts= xfce_rc_read_bool_entry
-               (rc,"selecting_starts",FALSE);           
-            pd->use_global_command= xfce_rc_read_bool_entry
-               (rc,"use_global_command",FALSE); 
-               
-            if(pd->global_command) g_free(pd->global_command);
-            pd->global_command = g_strdup((gchar *)xfce_rc_read_entry
-               (rc,"global_command",""));
-                            
-            pd->repeat_alarm= xfce_rc_read_bool_entry
-                (rc,"repeat_alarm",FALSE);
-            pd->repetitions= xfce_rc_read_int_entry
-                (rc,"repetitions",1);
-            pd->repeat_interval= xfce_rc_read_int_entry
-                (rc,"repeat_interval",10);
-
-          }
-
-          add_pbar(pd->base,pd);
-
-             xfce_rc_close(rc);
-          }
-
-//   }
-  }
-
-}
-
-
-/**
- * Saves the list to a keyfile, backup a permanent copy
-**/
-static void save_settings(XfcePanelPlugin *plugin, plugin_data *pd){
-
-  gchar groupname[8];
-  gint row_count;
-  GList *list;
-  alarm_t *alrm;
-  FILE *conffile;
-  XfceRc *rc;
-  gchar *file, *contents=NULL;
-
-  if (!(file = xfce_panel_plugin_save_location (plugin, TRUE)))
-    return;
-
-  // We do this to start a fresh config file, otherwise if the old config file is longer,
-  // the tail will not get truncated. See
-  // http://bugzilla.xfce.org/show_bug.cgi?id=2647
-  // for a related bug report.
-  conffile = fopen(file,"w");
-  if (conffile)
-    fclose(conffile);
-
-  rc = xfce_rc_simple_open (file, FALSE);
-
-  if (!rc)
-    return;
-
-  list = pd->alarm_list;
-
-  row_count = 0;
-
-  while (list){
-
-      g_snprintf(groupname,7,"G%d",row_count);
-      
-      xfce_rc_set_group(rc,groupname);
-      
-      alrm = (alarm_t *) list->data;
-
-      xfce_rc_write_entry(rc,"timername",alrm->name);
-
-      xfce_rc_write_int_entry(rc,"time",alrm->time);
-
-      xfce_rc_write_entry(rc,"timercommand",alrm->command);
-
-      xfce_rc_write_entry(rc,"timerinfo",alrm->info);
-
-      xfce_rc_write_bool_entry(rc,"is_countdown",alrm->iscountdown);
-
-      row_count ++;
-      list = list->next;
-  }
-
-
-  /* save the other options */
-  xfce_rc_set_group(rc,"others");
-
-  xfce_rc_write_bool_entry(rc,"nowin_if_alarm",pd->nowin_if_alarm);
-  xfce_rc_write_bool_entry(rc,"selecting_starts",pd->selecting_starts);
-  xfce_rc_write_bool_entry(rc,"use_global_command",pd->use_global_command);
-  xfce_rc_write_entry(rc,"global_command",pd->global_command);
-  xfce_rc_write_bool_entry(rc,"repeat_alarm",pd->repeat_alarm);
-  xfce_rc_write_int_entry(rc,"repetitions",pd->repetitions);
-  xfce_rc_write_int_entry(rc,"repeat_interval",pd->repeat_interval);
-
-  xfce_rc_close(rc);
-
-  conffile = fopen (pd->configfile,"w");
-  /* We backup a permanent copy, which we'll use to load settings */
-  if (conffile && g_file_get_contents(file,&contents,NULL,NULL)){
-    fputs(contents,conffile);
-    fclose(conffile);
-  }
-
-  g_free(file);
-  if(contents)
-    g_free(contents);
-
-}
-
-
-/**
- * Activates the Edit and Remove buttons when an item in the list is selected
-**/
-
-static void tree_selected (GtkTreeSelection *select, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  gtk_widget_set_sensitive(pd->buttonedit,TRUE);
-  gtk_widget_set_sensitive(pd->buttonremove,TRUE);
-  gtk_widget_set_sensitive(pd->buttonup,TRUE);
-  gtk_widget_set_sensitive(pd->buttondown,TRUE);
-
-}
-
-
-/******************/
-/* plugin_free    */
-/******************/
-
-static void
-plugin_free (XfcePanelPlugin *plugin, plugin_data *pd)
-{
-
-  /* remove timeouts */
-  if (pd->timeout!=0) g_source_remove(pd->timeout);
-  if (pd->repeat_timeout!=0) g_source_remove(pd->repeat_timeout);
-
-  /*save_settings(pd);*/
-
-  if(pd->timer)
-    g_timer_destroy(pd->timer);
-    
-  if(pd->active_timer_name)
-    g_free(pd->active_timer_name);
-        
-  if(pd->timeout_command)
-    g_free(pd->timeout_command);
-
-  if(pd->global_command)
-    g_free(pd->global_command);
-
-  if(pd->configfile)
-    g_free(pd->configfile);
-    
-  if(pd->liststore) {
-	gtk_list_store_clear (pd->liststore);
-    //g_free (pd->liststore);
-  }
-  
-  if(pd->alarm_list)
-    g_list_free (pd->alarm_list);  
-
-  /* destroy the tooltips */
-  gtk_object_destroy(GTK_OBJECT(pd->tip));
-
-  /* destroy all widgets */
-#ifndef HAVE_XFCE48
-	gtk_widget_destroy(GTK_WIDGET(pd->eventbox));
-#endif  
-
-  /* free the plugin data structure */
-  g_free(pd);
-
-  gtk_main_quit();
-}
-
-/***************************/
-/* options dialog response */
-/***************************/
-static void
-options_dialog_response (GtkWidget *dlg, int reponse, plugin_data *pd)
-{
-	if(pd->global_command)
-		g_free(pd->global_command);
-	pd->global_command = g_strdup (gtk_entry_get_text((GtkEntry *)pd->glob_command_entry));
-    gtk_widget_destroy (dlg);
-    xfce_panel_plugin_unblock_menu (pd->base);
-    save_settings(pd->base,pd);
-}
-
-/**
- * nowin_if_alarm toggle callback
-**/
-static void toggle_nowin_if_alarm(GtkToggleButton *button, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  pd->nowin_if_alarm = gtk_toggle_button_get_active(button);
-
-}
-
-/**
- * selecting_starts toggle callback
-**/
-static void toggle_selecting_starts(GtkToggleButton *button, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  pd->selecting_starts = gtk_toggle_button_get_active(button);
-
-}
-/**
- * toggle_global_command toggle callback
-**/
-static void toggle_global_command(GtkToggleButton *button, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  pd->use_global_command = gtk_toggle_button_get_active(button);
-
-  gtk_widget_set_sensitive(pd->global_command_box,pd->use_global_command);
-
-}
-
-/**
- * toggle_repeat_alarm toggle callback
-**/
-static void toggle_repeat_alarm(GtkToggleButton *button, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  pd->repeat_alarm = gtk_toggle_button_get_active(button);
-
-  gtk_widget_set_sensitive(pd->repeat_alarm_box,pd->repeat_alarm);
-
-}
-
-/**
- * Spinbutton 1 (#of alarm repetitions
- * value change callback              
-**/
-static void spin1_changed(GtkSpinButton *button, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  pd->repetitions = gtk_spin_button_get_value_as_int(button);
-
-}
-
-/**
- * Spinbutton 1 (alarm repetition 
- * interval) value change callback 
-**/
-static void spin2_changed(GtkSpinButton *button, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-
-  pd->repeat_interval = gtk_spin_button_get_value_as_int(button);
-
-}
-
-/**
- * options dialog
-**/
-static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
-
-  GtkWidget *vbox=gtk_vbox_new(FALSE,0); /*outermost box */
-  GtkWidget *hbox=gtk_hbox_new(FALSE,0); /* holds the treeview and buttons */
-  GtkWidget *buttonbox,*button,*sw,*tree,*spinbutton;
-  GtkTreeSelection *select;
-  GtkTreeViewColumn *column;
-  GtkWidget *dlg=NULL, *header=NULL;
-  GtkCellRenderer *renderer;
-
-
-  xfce_panel_plugin_block_menu (plugin);
-
-
-
-#ifdef HAVE_XFCE48
-  header = xfce_titled_dialog_new_with_buttons (_("Xfce4 Timer Options"), 
-                     GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
-                                               GTK_DIALOG_DESTROY_WITH_PARENT |
-                                               GTK_DIALOG_NO_SEPARATOR,
-                                               GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
-                                               NULL);
-
- dlg = header;                                               
-#else                                               
-  header = xfce_create_header (NULL, _("Xfce4 Timer Options"));
-  
-  dlg = gtk_dialog_new_with_buttons (_("Xfce 4 Timer Plugin"),
-              GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
-              GTK_DIALOG_DESTROY_WITH_PARENT |
-              GTK_DIALOG_NO_SEPARATOR,
-              GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
-              NULL);
-
-
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header,
-                      FALSE, TRUE, 0);    
-#endif  
-
-  g_signal_connect (dlg, "response", G_CALLBACK (options_dialog_response),
-                    pd);
-
-  gtk_container_set_border_width (GTK_CONTAINER(dlg), BORDER);
-
-  gtk_widget_set_size_request (dlg, 650, -1);
-  gtk_window_set_position(GTK_WINDOW(header),GTK_WIN_POS_CENTER);
-
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox,
-                      TRUE, TRUE, WIDGET_SPACING);
-
-
-  hbox = gtk_hbox_new(FALSE, BORDER);
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,TRUE,TRUE,BORDER);
-
-  sw = gtk_scrolled_window_new (NULL, NULL);
-
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                 GTK_POLICY_AUTOMATIC,
-                 GTK_POLICY_AUTOMATIC);
-
-  gtk_box_pack_start(GTK_BOX(hbox),sw,TRUE,TRUE,0);
-
-  fill_liststore (pd,NULL);
-      
-  tree=gtk_tree_view_new_with_model(GTK_TREE_MODEL(pd->liststore));
-  pd->tree=tree;
-  gtk_tree_view_set_rules_hint  (GTK_TREE_VIEW (tree), TRUE);
-  gtk_tree_selection_set_mode   (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree)),
-                 GTK_SELECTION_SINGLE);
-     
-  renderer = gtk_cell_renderer_text_new ();            
-  column = gtk_tree_view_column_new_with_attributes (_("Timer name"), renderer,
-                            "text", 1, NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
-
-
-  column = gtk_tree_view_column_new_with_attributes (_("Countdown period /\nAlarm time"),
-                            renderer, "text", 2, NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
-
-  column = gtk_tree_view_column_new_with_attributes (_("Alarm command"), renderer,
-                            "text", 3, NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
-
-
-  if(tree)
-     gtk_container_add(GTK_CONTAINER(sw),tree);
-
-  gtk_widget_set_size_request(GTK_WIDGET(sw),350,200);
-
-  select = gtk_tree_view_get_selection (GTK_TREE_VIEW (pd->tree));
-  gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
-  g_signal_connect  (G_OBJECT (select), "changed",
-            G_CALLBACK(tree_selected), pd);
-
-
-  buttonbox=gtk_vbutton_box_new();
-  gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox),GTK_BUTTONBOX_START);
-  gtk_button_box_set_spacing(GTK_BUTTON_BOX(buttonbox),WIDGET_SPACING<<1);
-  gtk_box_pack_start(GTK_BOX(hbox),buttonbox,FALSE,FALSE,0);
-
-  button = gtk_button_new_from_stock (GTK_STOCK_ADD);
-  pd->buttonadd=button;
-  gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING<<1);
-  gtk_widget_set_sensitive(button,TRUE);
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(add_edit_clicked), pd);
-
-
-  button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
-  pd->buttonedit=button;
-  gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING<<1);
-  gtk_widget_set_sensitive(button,FALSE);
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(add_edit_clicked), pd);
-
-  button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
-  pd->buttonremove=button;
-  gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING);
-  gtk_widget_set_sensitive(button,FALSE);
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(remove_clicked), pd);
-
-  button = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
-  pd->buttonup=button;
-  gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING);
-  gtk_widget_set_sensitive(button,FALSE);
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(up_clicked), pd);
-  
-  button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
-  pd->buttondown=button;
-  gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING);
-  gtk_widget_set_sensitive(button,FALSE);
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(down_clicked), pd);
-  
-  gtk_widget_set_size_request(hbox,-1,-1);
-  
-  gtk_box_pack_start(GTK_BOX(vbox),gtk_hseparator_new(),FALSE,FALSE,BORDER);
-
-  button=gtk_check_button_new_with_label(_("Don't display a warning  if an alarm command is set"));
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->nowin_if_alarm);
-  g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_nowin_if_alarm),pd);
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-
-  button=gtk_check_button_new_with_label(_("Selecting a timer starts it"));
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->selecting_starts);
-  g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_selecting_starts),pd);
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-
-  gtk_box_pack_start(GTK_BOX(vbox),gtk_hseparator_new(),FALSE,FALSE,BORDER);
-
-  /* Default alarm command config */
-  button=gtk_check_button_new_with_label(_("Use a default alarm command"));
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->use_global_command);
-  g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_global_command),pd);
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-
-  hbox = gtk_hbox_new (FALSE,0);
-  pd->global_command_box=hbox;
-  gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(_("Default command: ")),FALSE,FALSE,0);
-  pd->glob_command_entry = (GtkWidget *) gtk_entry_new();
-  gtk_widget_set_size_request(pd->glob_command_entry,400,-1);
-  gtk_entry_set_text(GTK_ENTRY(pd->glob_command_entry), pd->global_command);
-  gtk_box_pack_start(GTK_BOX(hbox),pd->glob_command_entry,FALSE,FALSE,10);
-
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,WIDGET_SPACING);
-  gtk_widget_set_sensitive(hbox,pd->use_global_command);
-  
-  gtk_box_pack_start(GTK_BOX(vbox),gtk_hseparator_new(),FALSE,FALSE,BORDER);
-  
-  /* Alarm repetitions config */  
-  button=gtk_check_button_new_with_label(_("Repeat the alarm command"));
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->repeat_alarm);
-  g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_repeat_alarm),pd);
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-  
-  hbox = gtk_hbox_new (FALSE,0);
-  pd->repeat_alarm_box=hbox;
-  gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(_("Number of repetitions")),FALSE,FALSE,0);
-  spinbutton=gtk_spin_button_new_with_range(1,50,1);
-  pd->spin_repeat=spinbutton;
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), pd->repetitions);
-  g_signal_connect(G_OBJECT(spinbutton),"value-changed", G_CALLBACK(spin1_changed), pd);
-  gtk_box_pack_start(GTK_BOX(hbox),spinbutton,FALSE,FALSE,10);
-  gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(_("  Time interval (sec.)")),FALSE,FALSE,0);
-  spinbutton=gtk_spin_button_new_with_range(1,600,1);
-  pd->spin_interval=spinbutton;
-  gtk_box_pack_start(GTK_BOX(hbox),spinbutton,FALSE,FALSE,10);
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), pd->repeat_interval);
-  g_signal_connect(G_OBJECT(spinbutton),"value-changed", G_CALLBACK(spin2_changed), pd);
-
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,WIDGET_SPACING);
-  gtk_widget_set_sensitive(hbox,pd->repeat_alarm);
-
-
-
-  gtk_widget_show_all(GTK_WIDGET(dlg));
-
-}
-
-/**
- * Show the "About" window
-**/
-static void show_about_window(XfcePanelPlugin *plugin, plugin_data *pd)
-{
-   GdkPixbuf *icon;
-   const gchar *author[] = { "Kemal Ilgar Eroğlu <[e-mail]>", NULL};
-   const gchar *translators = 
-"Mohammad Alhargan <[e-mail]> \n\
-Marcos Antonio Alvarez Costales <[e-mail]> \n\
-Harald Servat <[e-mail]> \n\
-Michal Várady <[e-mail]>\n\
-Per Kongstad <[e-mail]>\n\
-Simon Schneider <[e-mail]>\n\
-Efstathios Iosifidis <[e-mail]>\n\
-Jeff Bailes <[e-mail]>\n\
-Sergio <[e-mail]>\n\
-Piarres Beobide <[e-mail]>\n\
-Maximilian Schleiss <[e-mail]>\n\
-Leandro Regueiro <[e-mail]>\n\
-Ivica Kolić <[e-mail]>\n\
-Gabor Kelemen <kelemeng at gnome dot hu>\n\
-Andhika Padmawan <[e-mail]>\n\
-Cristian Marchi <[e-mail]>\n\
-Nobuhiro Iwamatsu <[e-mail]>\n\
-Seong-ho Cho <[e-mail]>\n\
-Rihards Priedītis <[e-mail]>\n\
-Pjotr <[e-mail]>\n\
-Piotr Sokół <[e-mail]>\n\
-Sérgio Marques <[e-mail]>\n\
-Rafael Ferreira <[e-mail]>\n\
-Dima Smirnov <[e-mail]>\n\
-Tomáš Vadina <[e-mail]>\n\
-Besnik Bleta <[e-mail]>\n\
-Саша Петровић <[e-mail]>\n\
-Daniel Nylander <[e-mail]>\n\
-Kemal Ilgar Eroğlu <[e-mail]>\n\
-Gheyret T.Kenji <[e-mail]>\n\
-Dmitry Nikitin <[e-mail]>\n\
-Muhammad Ali Makki <[e-mail]>\n\
-Hunt Xu <[e-mail]>\n\
-Cheng-Chia Tseng <[e-mail]>\n";
-	   
-   icon = xfce_panel_pixbuf_from_source("xfce4-timer", NULL, 48);
-   gtk_show_about_dialog(NULL,
-   	  "title", _("About xfce4-timer-plugin"),
-      "logo", icon,
-      "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL),
-      "version", PACKAGE_VERSION,
-      "program-name", PACKAGE_NAME,
-      "comments", _("A plugin to define countdown timers or alarms at given times."),
-      "website", "http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin",
-      "copyright", _("Copyright (c) 2005-2013\n"),
-      "authors", author,
-      "translator-credits" , translators,
-      NULL);
-
-   if(icon)
-      g_object_unref(G_OBJECT(icon));
-}
-
-/**
- * create_sample_control
- *
- * Create a new instance of the plugin.
- *
- * @control : #Control parent container
- *
- * Returns %TRUE on success, %FALSE on failure.
- **/
- 
-static void create_plugin_control (XfcePanelPlugin *plugin)
-{
-
-  GtkWidget *base,*menu,*socket,*menuitem,*box,*pbar2;
-  GtkTooltips *tooltip;
-  char command[1024];
-  gchar *filename,*pathname;
-
-  xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-
-  plugin_data *pd=g_new0(plugin_data,1);
-
-  pd->base=plugin;
-  pd->count=0;
-  pd->pbar=gtk_progress_bar_new();
-  pd->liststore=gtk_list_store_new(4,
-         G_TYPE_POINTER, /* Column 0: GList alarm list node */
-         G_TYPE_STRING,  /* Column 1: Name */
-         G_TYPE_STRING,  /* Column 2: Timer period/alarm time - info string */
-         G_TYPE_STRING);  /* Command to run */
-
-#ifndef HAVE_XFCE48
-  pd->eventbox = gtk_event_box_new();
-#endif  
-  pd->box=NULL;
-  pd->timer_on=FALSE;
-  pd->timeout=0;
-  pd->buttonadd=NULL;
-  pd->buttonedit=NULL;
-  pd->buttonremove=NULL;
-  pd->menu=NULL;
-  pd->tip=gtk_tooltips_new();
-  pd->timeout_command=NULL;
-  pd->timer=NULL;
-  pd->active_timer_name = g_strdup("");
-  pd->nowin_if_alarm=FALSE;
-  pd->selecting_starts=FALSE;
-  pd->repeat_alarm=FALSE;
-  pd->is_paused=FALSE;
-  pd->is_countdown=TRUE;
-  pd->use_global_command = FALSE;
-  pd->glob_command_entry = NULL;
-  pd->global_command = g_strdup(""); /* For Gtk >= 3.4 one could just set = NULL */
-  pd->global_command_box = NULL;  
-  pd->repeat_alarm_box=NULL;
-  pd->repetitions=1;
-  pd->rem_repetitions=1;
-  pd->repeat_interval=10;
-  pd->alarm_repeating=FALSE;
-  pd->repeat_timeout=0;
-  pd->alarm_list = NULL;
-  pd->selected=NULL;
-  
-  gtk_tooltips_set_tip(pd->tip, GTK_WIDGET(plugin), "", NULL);
-  gtk_tooltips_disable(pd->tip);
-
-
-  g_object_ref(pd->liststore);
-
-  filename = xfce_panel_plugin_save_location (pd->base,TRUE);
-  pathname = g_path_get_dirname (filename);
-  pd->configfile = g_strconcat (pathname,"/XfceTimer.rc",NULL);
-  g_free(filename);
-  g_free(pathname);
-
-  load_settings(pd);
-  pd->selected = pd->alarm_list;
-      
-  gtk_progress_bar_set_bar_style    (GTK_PROGRESS_BAR(pd->pbar),
-                    GTK_PROGRESS_CONTINUOUS);
-  gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),0);
-
-  add_pbar(pd->base,pd);
-
-  /* Trying to get a thin box, but no way */
-  gtk_widget_set_size_request(GTK_WIDGET(plugin),10,10);
-  xfce_panel_plugin_set_expand(plugin,FALSE);
-
-#ifdef HAVE_XFCE48
-  g_signal_connect  (G_OBJECT(plugin), "button_press_event",
-            G_CALLBACK(pbar_clicked), pd);   
-#else
-  gtk_container_add(GTK_CONTAINER(plugin),pd->eventbox);
-  g_signal_connect  (G_OBJECT(pd->eventbox), "button_press_event",
-            G_CALLBACK(pbar_clicked), pd);
-#endif  
-
-  gtk_widget_show_all(GTK_WIDGET(plugin));
-
-  g_signal_connect (plugin, "free-data",
-                      G_CALLBACK (plugin_free), pd);
-
-  g_signal_connect (plugin, "save",
-                      G_CALLBACK (save_settings), pd);
-
-  g_signal_connect (plugin, "orientation-changed",
-                      G_CALLBACK (orient_change), pd);
-
-  xfce_panel_plugin_menu_show_configure (plugin);
-  g_signal_connect (plugin, "configure-plugin",
-                      G_CALLBACK (plugin_create_options), pd);
-
-  xfce_panel_plugin_menu_show_about(plugin);
-  g_signal_connect (plugin, "about", G_CALLBACK (show_about_window), pd);                      
-                   
-}
-
-

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2013-05-22 21:42:15 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-01_improve-timer-stop.patch
-02_fix-format-string.patch

=== modified file 'ChangeLog'
--- ChangeLog	2013-05-22 21:42:15 +0000
+++ ChangeLog	2014-07-15 20:47:56 +0000
@@ -1,3 +1,7 @@
+05/06/2014 Kemal Ilgar Eroglu <[e-mail]>
+	* Version 1.6.0
+	* Added button in the alarm window to rerun the timer
+	* Minor fixes and code cleanup
 10/05/2013 Kemal Ilgar Eroglu <[e-mail]>
 	* Version 1.5.0
 	* Major code reorganization

=== modified file 'Makefile.in'
--- Makefile.in	2013-05-22 21:42:15 +0000
+++ Makefile.in	2014-07-15 20:47:56 +0000
@@ -54,16 +54,15 @@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	TODO acconfig.h compile config.guess config.sub depcomp \
-	install-sh ltmain.sh missing mkinstalldirs
+	TODO compile config.guess config.sub depcomp install-sh \
+	ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -370,7 +369,7 @@
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@

=== removed file 'acconfig.h'
--- acconfig.h	2009-02-22 20:07:50 +0000
+++ acconfig.h	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef HAVE_LIBSM
-#undef PACKAGE_LOCALE_DIR
-#undef PACKAGE_DOC_DIR
-#undef PACKAGE_DATA_DIR
-#undef PACKAGE_PIXMAPS_DIR
-#undef PACKAGE_HELP_DIR
-#undef PACKAGE_MENU_DIR
-#undef PACKAGE_SOURCE_DIR
-#undef GETTEXT_PACKAGE

=== removed file 'acinclude.m4'
--- acinclude.m4	2009-02-22 20:07:50 +0000
+++ acinclude.m4	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])

=== modified file 'aclocal.m4'
--- aclocal.m4	2013-05-22 21:42:15 +0000
+++ aclocal.m4	2014-07-15 20:47:56 +0000
@@ -9260,7 +9260,7 @@
 m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10923,4 +10923,3 @@
 ])
 
 
-m4_include([acinclude.m4])

=== modified file 'config.h.in'
--- config.h.in	2013-05-22 21:42:15 +0000
+++ config.h.in	2014-07-15 20:47:56 +0000
@@ -1,18 +1,4 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef HAVE_LIBSM
-#undef PACKAGE_LOCALE_DIR
-#undef PACKAGE_DOC_DIR
-#undef PACKAGE_DATA_DIR
-#undef PACKAGE_PIXMAPS_DIR
-#undef PACKAGE_HELP_DIR
-#undef PACKAGE_MENU_DIR
-#undef PACKAGE_SOURCE_DIR
-#undef GETTEXT_PACKAGE
 
 /* always defined to indicate that i18n is enabled */
 #undef ENABLE_NLS

=== modified file 'configure'
--- configure	2013-05-22 21:42:15 +0000
+++ configure	2014-07-15 20:47:56 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xfce4-timer-plugin 1.5.0.
+# Generated by GNU Autoconf 2.69 for xfce4-timer-plugin 1.6.0.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='xfce4-timer-plugin'
 PACKAGE_TARNAME='xfce4-timer-plugin'
-PACKAGE_VERSION='1.5.0'
-PACKAGE_STRING='xfce4-timer-plugin 1.5.0'
+PACKAGE_VERSION='1.6.0'
+PACKAGE_STRING='xfce4-timer-plugin 1.6.0'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1399,7 +1399,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xfce4-timer-plugin 1.5.0 to adapt to many kinds of systems.
+\`configure' configures xfce4-timer-plugin 1.6.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1470,7 +1470,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xfce4-timer-plugin 1.5.0:";;
+     short | recursive ) echo "Configuration of xfce4-timer-plugin 1.6.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1584,7 +1584,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xfce4-timer-plugin configure 1.5.0
+xfce4-timer-plugin configure 1.6.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1953,7 +1953,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xfce4-timer-plugin $as_me 1.5.0, which was
+It was created by xfce4-timer-plugin $as_me 1.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2770,7 +2770,7 @@
 
 # Define the identity of the package.
  PACKAGE='xfce4-timer-plugin'
- VERSION='1.5.0'
+ VERSION='1.6.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12304,7 +12304,7 @@
 
 
 
-    ALL_LINGUAS="ar ast ca cs da de el en_GB es eu fr gl hr hu id it ja ko lv nl pl pt pt_BR ru sk sq sr sv tr ug uk ur ur_PK zh_CN zh_TW "
+    ALL_LINGUAS="ar ast bg ca cs da de el en_AU en_GB es eu fr gl hr hu id it ja ko lv ms nb nl oc pl pt pt_BR ru sk sq sr sv th tr ug uk ur ur_PK zh_CN zh_TW "
 
    for ac_header in locale.h
 do :
@@ -15178,7 +15178,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xfce4-timer-plugin $as_me 1.5.0, which was
+This file was extended by xfce4-timer-plugin $as_me 1.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15244,7 +15244,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xfce4-timer-plugin config.status 1.5.0
+xfce4-timer-plugin config.status 1.6.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.in'
--- configure.in	2013-05-22 21:42:15 +0000
+++ configure.in	2014-07-15 20:47:56 +0000
@@ -10,12 +10,14 @@
 
 dnl version info
 m4_define([xfce4_timer_version_major], [1])
-m4_define([xfce4_timer_version_minor], [5])
+m4_define([xfce4_timer_version_minor], [6])
 m4_define([xfce4_timer_version_micro], [0])
-m4_define([xfce4_timer_version_build], [49a7be4])
+m4_define([xfce4_timer_version_build], [b92a1f2])
 m4_define([xfce4_timer_version_tag]) # Leave empty only for releases, but use 'git' in most cases
 m4_define([xfce4_timer_version], [xfce4_timer_version_major().xfce4_timer_version_minor().xfce4_timer_version_micro()ifelse(xfce4_timer_version_tag(), [], [],[xfce4_timer_version_tag()-xfce4_timer_version_build()])])
 
+libexecdir = ${exec_prefix}/libexec
+
 dnl init autoconf
 AC_INIT([xfce4-timer-plugin], [xfce4_timer_version], [[e-mail]])
 AC_PREREQ([2.50])
@@ -39,7 +41,7 @@
 AC_HEADER_STDC
 
 dnl Check for i18n support
-XDT_I18N([ar ast ca cs da de el en_GB es eu fr gl hr hu id it ja ko lv nl pl pt pt_BR ru sk sq sr sv tr ug uk ur ur_PK zh_CN zh_TW ])
+XDT_I18N([ar ast bg ca cs da de el en_AU en_GB es eu fr gl hr hu id it ja ko lv ms nb nl oc pl pt pt_BR ru sk sq sr sv th tr ug uk ur ur_PK zh_CN zh_TW ])
 
 dnl required
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.4.0])

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-22 21:42:15 +0000
+++ debian/changelog	2014-07-15 20:47:56 +0000
@@ -1,3 +1,9 @@
+xfce4-timer-plugin (1.6.0-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release.
+
+ -- Jackson Doak <[e-mail]>  Tue, 15 Jul 2014 08:18:33 +1000
+
 xfce4-timer-plugin (1.5.0-1) unstable; urgency=low
 
   * New upstream release.                                       closes: #709338

=== modified file 'debian/control'
--- debian/control	2013-05-22 21:42:15 +0000
+++ debian/control	2014-07-15 20:47:56 +0000
@@ -1,7 +1,8 @@
 Source: xfce4-timer-plugin
 Section: xfce
 Priority: optional
-Maintainer: Debian Xfce Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Xfce Maintainers <[e-mail]>
 Uploaders: Yves-Alexis Perez <[e-mail]>, Lionel Le Folgoc <[e-mail]>
 Build-Depends: debhelper (>= 9), libxml-parser-perl,
  xfce4-panel-dev, intltool, pkg-config, libglib2.0-dev,

=== modified file 'debian/patches/01_improve-timer-stop.patch'
--- debian/patches/01_improve-timer-stop.patch	2013-05-22 21:42:15 +0000
+++ debian/patches/01_improve-timer-stop.patch	2014-07-15 20:47:56 +0000
@@ -1,11 +1,15 @@
+---
+ src/xfcetimer.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
 --- a/src/xfcetimer.c
 +++ b/src/xfcetimer.c
-@@ -162,6 +162,8 @@ static gboolean update_function (gpointe
+@@ -167,6 +167,8 @@ static gboolean update_function (gpointe
    }
  
    /* Countdown is over, stop timer and free resources */
 +  g_snprintf(tiptext,31,_("%ds left"),0);
 +  gtk_tooltips_set_tip(pd->tip,GTK_WIDGET(pd->base),tiptext,NULL);
  
-   if( (strlen(pd->timeout_command)==0) || !pd->nowin_if_alarm ) {
-     gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),1);
+   if(pd->timer)
+      g_timer_destroy(pd->timer);

=== modified file 'debian/patches/02_fix-format-string.patch'
--- debian/patches/02_fix-format-string.patch	2013-05-22 21:42:15 +0000
+++ debian/patches/02_fix-format-string.patch	2014-07-15 20:47:56 +0000
@@ -1,13 +1,18 @@
 Author: Yves-Alexis Perez <[e-mail]>
 Description: Fix format string issue
 Forwarded: https://bugzilla.xfce.org/show_bug.cgi?id=10110
+---
+ src/xfcetimer.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/src/xfcetimer.c
 +++ b/src/xfcetimer.c
-@@ -175,6 +175,7 @@ static gboolean update_function (gpointe
-                                     GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+@@ -192,7 +192,7 @@ static gboolean update_function (gpointe
+ 
+     dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
                                      GTK_MESSAGE_WARNING,
-                                     GTK_BUTTONS_CLOSE,
-+                                    "%s",
-                                     dialog_message);
- 
-     g_signal_connect_swapped (dialog, "response",
+-                                    GTK_BUTTONS_NONE, dialog_message);
++                                    GTK_BUTTONS_NONE, "%s",dialog_message);
+                            
+     gtk_window_set_title ((GtkWindow *) dialog, dialog_title);                                    
+  

=== modified file 'icons/48x48/Makefile.in'
--- icons/48x48/Makefile.in	2013-05-22 21:42:15 +0000
+++ icons/48x48/Makefile.in	2014-07-15 20:47:56 +0000
@@ -54,11 +54,10 @@
 subdir = icons/48x48
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =

=== modified file 'icons/Makefile.in'
--- icons/Makefile.in	2013-05-22 21:42:15 +0000
+++ icons/Makefile.in	2014-07-15 20:47:56 +0000
@@ -53,11 +53,10 @@
 subdir = icons
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =

=== removed file 'mkinstalldirs'
--- mkinstalldirs	2011-09-04 22:46:46 +0000
+++ mkinstalldirs	1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2009-04-28.21; # UTC
-
-# Original author: Noah Friedman <[e-mail]>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <[e-mail]> or send patches to
-# <[e-mail]>.
-
-nl='
-'
-IFS=" ""	$nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <[e-mail]>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
-
-  for d
-  do
-    test "x$d" = x && continue
-
-    pathcomp=$pathcomp$d
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp=$pathcomp/
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

=== removed file 'po/ChangeLog'
--- po/ChangeLog	2011-09-04 22:46:46 +0000
+++ po/ChangeLog	1970-01-01 00:00:00 +0000
@@ -1,224 +0,0 @@
-2009-08-08  Mike Massonnet <[e-mail]>
-
-	* ast.po: Asturian translation added (Marcos Alvarez Costales)
-
-2009-07-25  Gabor Kelemen  <[e-mail]>
-
-	* hu.po: Translation reworked.
-
-2009-05-29  Mike Massonnet <[e-mail]>
-
-	* ur_PK.po: Urdu Pakistan translation update (Muhammad Ali Makki)
-	* ur.po: Urdu translation update (Muhammad Ali Makki)
-
-2009-04-26  Stavros Giannouris <[e-mail]>
-
-	* el.po, LINGUAS: Greek translation added (Evaggelos Balaskas)
-
-2009-04-16  Mike Massonnet <[e-mail]>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2009-03-30  Piotr Sokół <[e-mail]>
-
-	* pl.po: Polish translation update
-
-2009-03-14  Maximilian Schleiss <[e-mail]>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2009-03-06  Maximilian Schleiss <[e-mail]>
-
-	* ca.po: Catalan translation update (Harald Servat)
-
-2009-03-05  Mike Massonnet <[e-mail]>
-
-	* pt.po: Renamed pt_PT.po to pt.po (bug #4574)
-
-2009-03-01  Maximilian Schleiss <[e-mail]>
-
-	* pl.po: Polish translation update (Piotr Sokół)
-
->>>>>>> .r7285
-2009-02-22  Mike Massonnet <[e-mail]>
-
-	* es.po: Add Spanish translation (Abel Martín)
-
-2009-02-20  Maximilian Schleiss <[e-mail]>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2009-02-07  Maximilian Schleiss <[e-mail]>
-
-	* it.po; LINGUAS: Italian translation added (Cristian Marchi)
-
-2009-02-07  Alexander Toresson <[e-mail]>
-
-	* sv.po: Swedish translation update (Daniel Nylander)
-
-2009-02-01  Michal Várady <[e-mail]>
-
-	* cs.po: Czech translation fixed
-
-2009-01-13  Alexander Toresson <[e-mail]>
-
-	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
-
-2008-12-13  Maximilian Schleiss <[e-mail]>
-
-	* zh_CN.po: Simplified Chinese translation added (Hunt Xu)
-
-2008-11-16  Eren Türkay <[e-mail]>
-
-        * tr.po: Turkish translation update (Gökmen Görgen)
-
-2008-11-12  Piarres Beobide <[e-mail]>
-
-        * eu.po: Basque translation update
-
-2008-11-09  Maximilian Schleiss <[e-mail]>
-
-	* sq.po: Albanian translation update (Besnik Bleta)
-
-2008-10-12 Lars Nielsen <[e-mail]>
-
-	* da.po: Danish translation update
-
-2008-10-10  Maximilian Schleiss <[e-mail]>
-
-	* ja.po: Japanese translation update (Nobuhiro Iwamatsu)
-
-2008-07-30  Og Maciel <[e-mail]>
-
-	* pt_BR.po: Updated Brazilian Protuguese translation (Fábio Nogueira)
-
-2008-07-15 Mohamed Magdy <[e-mail]>
-
-    * ar.po: Add Arabic translation
-
-2008-06-26  Maximilian Schleiss <[e-mail]>
-
-	* gl.po, LINGUAS: Galician translation added (Leandro Regueiro)
-
-2008-06-25  Maximilian Schleiss <[e-mail]>
-
-	* id.po, LINGUAS: Indonesian translation added (Andhika Padmawan)
-
-2008-05-27  Mike Massonnet <[e-mail]>
-
-	* da.po, LINGUAS: Add Danish translation (Jens Hyllegaard)
-
-2008-05-14	Mike Massonnet <[e-mail]>
-
-	* ja.po: Update Japanese translation (Nobuhiro Iwamatsu)
-
-2007-11-18	Maximilian Schleiss <[e-mail]>
-
-	* lv.po: Latvian translation added
-	by Rihards Priedītis <[e-mail]>
-
-2007-11-15	Mike Massonnet <[e-mail]>
-
-	* ur.po: Update translation by Muhammad Ali Makki <[e-mail]>
-	* pk.po, ur.po: Rename pk.po to ur.po.
-
-2007-10-28	Mike Massonnet <[e-mail]>
-
-	* pk.po: Add new translation by محمد علي المكي <[e-mail]>
-
-2007-09-07  Og Maciel <[e-mail]>
-
-	* pt_BR.po: Brazilian Protuguese translation added
-	by Vladimir Melo <[e-mail]>
-
-2007-07-08  Maximilian Schleiss <[e-mail]>
-
-	* pt_PT.po: European Protuguese translation added
-	by Nuno Miguel <[e-mail]>
-
-2007-03-31  Pau Rul-lan Ferragut <[e-mail]>
-
-  * gb.po: British translation by Jeff Bailes <[e-mail]>
-
-2007-02-20  Maximilian Schleiss <[e-mail]>
-
-	* fr.po: Modified the French translation.
-
-2007-02-02  Maximilian Schleiss <[e-mail]>
-
-	* sq.po: Added the Albanian translation by
-	Besnik Bleta <[e-mail]>
-
-2006-09-18  Pau Rul-lan Ferragut <[e-mail]>
-
-	* ca.po: Add Catalan translation
-
-2006-09-17  Jean-François Wauthy <[e-mail]>
-
-	* cs.po: Updated Czech translations
-	* pl.po: Updated Polish translations
-
-2006-09-03  Jean-François Wauthy <[e-mail]>
-
-	* fr.po: Updated French translations
-	* pl.po: Updated Polish translations
-
-2006-08-29  Piarres Beobide  <[e-mail]>
-
-	* eu.po Basuqe trasnaltion update
-
-2006-08-27  Jean-François Wauthy <[e-mail]>
-
-	* cs.po: Add Czech translations
-
-2006-04-23  Kemal Ilgar Eroglu <[e-mail]>
-
-	* eu.po: Added the file check to configure.in .
-	* tr.po: Added Turkish translations.
-
-2006-04-23  Daichi Kawahata <[e-mail]>
-
-	* eu.po: Added Basque translations by Piarres Beobide
-	  <[e-mail]>.
-
-2006-04-09  Daichi Kawahata <[e-mail]>
-
-	* ru.po: Added Russian translations by Andrey Fedoseev
-	  <[e-mail]>.
-
-2006-04-08  Daichi Kawahata <[e-mail]>
-
-	* pl.po: Added Polish translations by Piotr Malinski
-	  <[e-mail]>.
-
-2006-04-04  Daichi Kawahata <[e-mail]>
-
-	* ja.po: Updated Japanese translations.
-	* fr.po: Added French translations by Stephane Roy
-	  <[e-mail]>.
-
-2006-04-03  Daichi Kawahata <[e-mail]>
-
-	* ja.po: Updated Japanese translations.
-
-2006-04-02  Daichi Kawahata <[e-mail]>
-
-	* ja.po: Updated Japanese translations.
-	* hu.po, ja.po, xfce4-timer.pot: Added translatable strings.
-	* hu.po, ja.po, xfce4-timer.pot: Updated.
-
-2006-02-23  Szervac Attila <[e-mail]>
-
-	* hu.po: hu updates.
-
-2006-02-23  Daichi Kawahata <[e-mail]>
-
-	* xfce4-timer.pot: Added.
-	* ja.po: Added Japanese translations.
-	* POTFILES.in: Updated.
-	* Makefile.in.in: Removed as well.
-
-2005-12-01  Kemal Ilgar Eroglu <[e-mail]>
-
-	* ChangeLog, Makefile.in.in, POTFILES.in: Initial import.
-

=== modified file 'po/ar.po'
--- po/ar.po	2013-05-22 21:42:15 +0000
+++ po/ar.po	2014-07-15 20:47:56 +0000
@@ -1,158 +1,158 @@
-# mohammad <[e-mail]>, 2012.
-# Mohammad Alhargan <[e-mail]>, 2012.
-# محمد الحرقان <[e-mail]>, 2012.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# mohammad alhargan <[e-mail]>, 2013
+# mohammad alhargan <[e-mail]>, 2012
+# mohammad alhargan <[e-mail]>, 2012
+# محمد الحرقان <[e-mail]>, 2012
+# محمد الحرقان <[e-mail]>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce\n"
+"Project-Id-Version: Xfce Panel Plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-10 12:32+0300\n"
-"PO-Revision-Date: 2012-11-18 22:49+0300\n"
-"Last-Translator: محمد الحرقان <[e-mail]>\n"
-"Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n"
+"POT-Creation-Date: 2014-06-05 01:42+0300\n"
+"PO-Revision-Date: 2013-10-24 04:45+0000\n"
+"Last-Translator: mohammad alhargan <[e-mail]>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/xfce/language/"
+"ar/)\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.7.1\n"
-"X-Poedit-Language: Arabic\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../src/xfcetimer.c:141
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dس %dد %ds تبقت"
 
-#: ../src/xfcetimer.c:144
+#: ../src/xfcetimer.c:149
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dد %dث تبقت"
 
-#: ../src/xfcetimer.c:146
+#: ../src/xfcetimer.c:151
 #, c-format
 msgid "%ds left"
 msgstr "%dث تبقت"
 
-#: ../src/xfcetimer.c:149
+#: ../src/xfcetimer.c:154
 msgid " (Paused)"
-msgstr ""
+msgstr " (مؤقتاً)"
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:170
-#, fuzzy, c-format
+#: ../src/xfcetimer.c:188
+#, c-format
 msgid ""
 "Beeep! :) \n"
 "Time is up for the alarm %s."
 msgstr ""
-"بيييب! :) \n"
-"حان الوقت!"
+"ببب! :) \n"
+"حان وقت التنبيه %s."
 
-#: ../src/xfcetimer.c:462
+#: ../src/xfcetimer.c:198
 #, fuzzy
+msgid "Rerun the timer"
+msgstr "استئناف التنبيه"
+
+#: ../src/xfcetimer.c:487
 msgid "Resume timer"
-msgstr "بدء تشغيل ضبط المؤقت"
+msgstr "استئناف التنبيه"
 
-#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
+#: ../src/xfcetimer.c:494 ../src/xfcetimer.c:550
 msgid "Stop timer"
-msgstr "إيقاف ضبط المؤقت"
+msgstr "إيقاف التنبيه"
 
-#: ../src/xfcetimer.c:513
-#, fuzzy
+#: ../src/xfcetimer.c:538
 msgid "Pause timer"
-msgstr "بدء تشغيل ضبط المؤقت"
+msgstr "إيقاف التنبيه مؤقتاً"
 
-#: ../src/xfcetimer.c:527
+#: ../src/xfcetimer.c:552
 msgid "Start timer"
-msgstr "بدء تشغيل ضبط المؤقت"
+msgstr "تشغيل التنبيه"
 
-#: ../src/xfcetimer.c:536
+#: ../src/xfcetimer.c:561
 msgid "Stop the alarm"
 msgstr "إيقاف التنبيه"
 
-#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
+#: ../src/xfcetimer.c:618 ../src/xfcetimer.c:689
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dس %dد %dث"
 
-#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
+#: ../src/xfcetimer.c:620 ../src/xfcetimer.c:691
 #, c-format
 msgid "%dm %ds"
 msgstr "%dد %dث"
 
-#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
+#: ../src/xfcetimer.c:622 ../src/xfcetimer.c:693
 #, c-format
 msgid "%ds"
 msgstr "%dث"
 
-#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
+#: ../src/xfcetimer.c:631 ../src/xfcetimer.c:702
 #, c-format
 msgid "At %02d:%02d"
 msgstr "عند %02d:%02d"
 
-#: ../src/xfcetimer.c:774
-#, fuzzy
+#: ../src/xfcetimer.c:801
 msgid "Name:"
-msgstr "اسم"
+msgstr "الاسم:"
 
 #. ********
-#: ../src/xfcetimer.c:782
+#: ../src/xfcetimer.c:809
 msgid "Enter the countdown time"
 msgstr "أدخل وقت العد التنازلي"
 
-#: ../src/xfcetimer.c:785
+#: ../src/xfcetimer.c:812
 msgid "Enter the time of alarm (24h format)"
 msgstr "أدخل وقت التنبيه (تنسيق 24 ساعة)"
 
-#: ../src/xfcetimer.c:797
+#: ../src/xfcetimer.c:824
 msgid "h  "
 msgstr "س  "
 
-#: ../src/xfcetimer.c:802
+#: ../src/xfcetimer.c:829
 msgid "m  "
 msgstr "د  "
 
-#: ../src/xfcetimer.c:807
+#: ../src/xfcetimer.c:834
 msgid "s  "
 msgstr "ث  "
 
-#: ../src/xfcetimer.c:810
-#, fuzzy
+#: ../src/xfcetimer.c:837
 msgid "or"
 msgstr "أو"
 
 #. **************
-#: ../src/xfcetimer.c:830
-#, fuzzy
+#: ../src/xfcetimer.c:857
 msgid "Command to run:"
-msgstr ""
-"\n"
-"الأمر للتشغيل"
+msgstr "أمر لتشغيله:"
 
-#: ../src/xfcetimer.c:860
+#: ../src/xfcetimer.c:887
 msgid "Add new alarm"
 msgstr "أضف تنبيه جديد"
 
-#: ../src/xfcetimer.c:897
+#: ../src/xfcetimer.c:924
 msgid "Edit alarm"
 msgstr "حرّر المنبّه"
 
-#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
+#: ../src/xfcetimer.c:1495 ../src/xfcetimer.c:1504
 msgid "Xfce4 Timer Options"
-msgstr "خيارات ضبط مؤقت اكسفس4"
+msgstr "خيارات ضبط تنبيه اكسفس4"
 
-#: ../src/xfcetimer.c:1461
-#, fuzzy
+#: ../src/xfcetimer.c:1506
 msgid "Xfce 4 Timer Plugin"
-msgstr "خيارات ضبط المؤقت Xfce4"
+msgstr "ملحق تنبيه إكسفس 4"
 
-#: ../src/xfcetimer.c:1507
-#, fuzzy
+#: ../src/xfcetimer.c:1552
 msgid "Timer name"
-msgstr ""
-"اسم\n"
-"المؤقت"
+msgstr "اسم المنبه"
 
-#: ../src/xfcetimer.c:1512
+#: ../src/xfcetimer.c:1557
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -160,73 +160,56 @@
 "فترة العد التنازلي /\n"
 "وقت التنبيه"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1561
 msgid "Alarm command"
 msgstr "أمر التنبيه"
 
-#: ../src/xfcetimer.c:1572
-#, fuzzy
+#: ../src/xfcetimer.c:1617
 msgid "Don't display a warning  if an alarm command is set"
-msgstr ""
-"لا تعرض إطار التنبيه\n"
-"إذا تم ضبط أمر التنبيه"
+msgstr "لا تعرض تحذير إذا تم تعيين أمر  تنبيه"
 
-#: ../src/xfcetimer.c:1577
+#: ../src/xfcetimer.c:1622
 msgid "Selecting a timer starts it"
-msgstr ""
+msgstr "تحديد منبه لتشغيله"
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1585
-#, fuzzy
+#: ../src/xfcetimer.c:1630
 msgid "Use a default alarm command"
-msgstr "تكرار أمر التنبيه:"
+msgstr "استخدم أمر التنبيه الافتراضي"
 
-#: ../src/xfcetimer.c:1592
-#, fuzzy
+#: ../src/xfcetimer.c:1637
 msgid "Default command: "
-msgstr "أمر التنبيه"
+msgstr "الأمر الافتراضي: "
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1604
-#, fuzzy
+#: ../src/xfcetimer.c:1649
 msgid "Repeat the alarm command"
-msgstr "تكرار أمر التنبيه:"
+msgstr "تكرار أمر التنبيه"
 
-#: ../src/xfcetimer.c:1611
+#: ../src/xfcetimer.c:1656
 msgid "Number of repetitions"
 msgstr "مرات التكرار"
 
-#: ../src/xfcetimer.c:1617
+#: ../src/xfcetimer.c:1662
 msgid "  Time interval (sec.)"
 msgstr "  الفاصل الزمني (ثانية.)"
 
-#: ../src/xfcetimer.c:1678
-#, fuzzy
+#: ../src/xfcetimer.c:1723
 msgid "About xfce4-timer-plugin"
-msgstr "خيارات ضبط المؤقت Xfce4"
+msgstr "حول xfce4-منبه--الملحق"
 
-#: ../src/xfcetimer.c:1683
+#: ../src/xfcetimer.c:1728
 msgid "A plugin to define countdown timers or alarms at given times."
-msgstr ""
+msgstr "ملحق عداد توقيت التنازلي أو تنبيه في أوقات محددة."
 
-#: ../src/xfcetimer.c:1685
+#: ../src/xfcetimer.c:1730
 msgid "Copyright (c) 2005-2013\n"
-msgstr ""
+msgstr "حقوق الطبع والنشر (ج) عام 2005-2013\n"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
-msgstr "مؤقت إكسفس 4"
+msgstr "منبه إكسفس 4"
 
 #: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Timer plugin for Xfce panel"
-msgstr "المؤقت، ملحق لوحة إكس"
-
-#~ msgid ""
-#~ "\n"
-#~ "or\n"
-#~ msgstr ""
-#~ "\n"
-#~ "أو\n"
-
-#~ msgid "Properties"
-#~ msgstr "خصائص"
+msgstr "التنبيه، ملحق لوحة إكس"

=== modified file 'po/ast.po'
--- po/ast.po	2013-05-22 21:42:15 +0000
+++ po/ast.po	2014-07-15 20:47:56 +0000
@@ -1,152 +1,154 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Tornes Llume <[e-mail]>, 2014
+# Tornes Llume <[e-mail]>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-timer-plugin\n"
+"Project-Id-Version: Xfce Panel Plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-10 12:32+0300\n"
-"PO-Revision-Date: 2009-07-13 19:55+0100\n"
-"Last-Translator: Marcos Antonio Alvarez Costales <[e-mail]>\n"
-"Language-Team: Asturian <[e-mail]>\n"
+"POT-Creation-Date: 2014-06-05 01:42+0300\n"
+"PO-Revision-Date: 2014-05-08 07:48+0000\n"
+"Last-Translator: Tornes Llume <[e-mail]>\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/xfce-panel-"
+"plugins/language/ast/)\n"
 "Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/xfcetimer.c:141
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds restantes"
 
-#: ../src/xfcetimer.c:144
+#: ../src/xfcetimer.c:149
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds restantes"
 
-#: ../src/xfcetimer.c:146
+#: ../src/xfcetimer.c:151
 #, c-format
 msgid "%ds left"
 msgstr "%ds restantes"
 
-#: ../src/xfcetimer.c:149
+#: ../src/xfcetimer.c:154
 msgid " (Paused)"
-msgstr ""
+msgstr " (Posáu)"
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:170
-#, fuzzy, c-format
+#: ../src/xfcetimer.c:188
+#, c-format
 msgid ""
 "Beeep! :) \n"
 "Time is up for the alarm %s."
 msgstr ""
-"Biiip! :) \n"
-"¡Acabóse'l tiempu!"
-
-#: ../src/xfcetimer.c:462
+"¡Biiiiiiip! :) \n"
+"Escosóse'l tiempu pa la to alarma %s."
+
+#: ../src/xfcetimer.c:198
+#, fuzzy
+msgid "Rerun the timer"
+msgstr "Posar temporizador"
+
+#: ../src/xfcetimer.c:487
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
+#: ../src/xfcetimer.c:494 ../src/xfcetimer.c:550
 msgid "Stop timer"
 msgstr "Parar temporizador"
 
-#: ../src/xfcetimer.c:513
-#, fuzzy
+#: ../src/xfcetimer.c:538
 msgid "Pause timer"
-msgstr "Entamar temporizador"
+msgstr "Posar temporizador"
 
-#: ../src/xfcetimer.c:527
+#: ../src/xfcetimer.c:552
 msgid "Start timer"
-msgstr "Entamar temporizador"
+msgstr "Aniciar temporizador"
 
-#: ../src/xfcetimer.c:536
+#: ../src/xfcetimer.c:561
 msgid "Stop the alarm"
 msgstr "Parar l'alarma"
 
-#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
+#: ../src/xfcetimer.c:618 ../src/xfcetimer.c:689
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
+#: ../src/xfcetimer.c:620 ../src/xfcetimer.c:691
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
+#: ../src/xfcetimer.c:622 ../src/xfcetimer.c:693
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
+#: ../src/xfcetimer.c:631 ../src/xfcetimer.c:702
 #, c-format
 msgid "At %02d:%02d"
 msgstr "A les %02d:%02d"
 
-#: ../src/xfcetimer.c:774
-#, fuzzy
+#: ../src/xfcetimer.c:801
 msgid "Name:"
-msgstr "Nome"
+msgstr "Nome:"
 
 #. ********
-#: ../src/xfcetimer.c:782
+#: ../src/xfcetimer.c:809
 msgid "Enter the countdown time"
-msgstr "Meta'l tiempu de cuenta atrás"
+msgstr "Introduz el tiempu de la cuenta atrás"
 
-#: ../src/xfcetimer.c:785
+#: ../src/xfcetimer.c:812
 msgid "Enter the time of alarm (24h format)"
-msgstr "Entre la hora d'alarma (formatu 24h)"
+msgstr "Introduz la hora d'alarma (formatu 24h)"
 
-#: ../src/xfcetimer.c:797
+#: ../src/xfcetimer.c:824
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:802
+#: ../src/xfcetimer.c:829
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:807
+#: ../src/xfcetimer.c:834
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:810
-#, fuzzy
+#: ../src/xfcetimer.c:837
 msgid "or"
 msgstr "o"
 
 #. **************
-#: ../src/xfcetimer.c:830
-#, fuzzy
+#: ../src/xfcetimer.c:857
 msgid "Command to run:"
-msgstr ""
-"\n"
-"El comandu a executar"
+msgstr "Comandu pa executar:"
 
-#: ../src/xfcetimer.c:860
+#: ../src/xfcetimer.c:887
 msgid "Add new alarm"
-msgstr "Amestar nueva alarma"
+msgstr "Amestar alarma nueva"
 
-#: ../src/xfcetimer.c:897
+#: ../src/xfcetimer.c:924
 msgid "Edit alarm"
 msgstr "Editar alarma"
 
-#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
+#: ../src/xfcetimer.c:1495 ../src/xfcetimer.c:1504
 msgid "Xfce4 Timer Options"
 msgstr "Opciones del temporizador de Xfce4"
 
-#: ../src/xfcetimer.c:1461
-#, fuzzy
+#: ../src/xfcetimer.c:1506
 msgid "Xfce 4 Timer Plugin"
-msgstr "Opciones del temporizador de Xfce4"
+msgstr "Complementu temporizador Xfce 4"
 
-#: ../src/xfcetimer.c:1507
-#, fuzzy
+#: ../src/xfcetimer.c:1552
 msgid "Timer name"
-msgstr ""
-"Nome del\n"
-"temporizador"
+msgstr "Nome del temporizador"
 
-#: ../src/xfcetimer.c:1512
+#: ../src/xfcetimer.c:1557
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -154,58 +156,53 @@
 "Periodu de cuenta atrás /\n"
 "Hora d'alarma"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1561
 msgid "Alarm command"
 msgstr "Comandu d'alarma"
 
-#: ../src/xfcetimer.c:1572
-#, fuzzy
+#: ../src/xfcetimer.c:1617
 msgid "Don't display a warning  if an alarm command is set"
-msgstr ""
-"Nun amosar la ventana d'alvertencia\n"
-"si se configuró un comandu d'alarma"
+msgstr "Nun amosar un avisu si s'afita un comandu d'alarma"
 
-#: ../src/xfcetimer.c:1577
+#: ../src/xfcetimer.c:1622
 msgid "Selecting a timer starts it"
-msgstr ""
+msgstr "Esbillar un temporizador col qu'entamar"
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1585
-#, fuzzy
+#: ../src/xfcetimer.c:1630
 msgid "Use a default alarm command"
-msgstr "Repetir el comandu d'alarma:"
+msgstr "Usar un comandu d'alarma por defeutu"
 
-#: ../src/xfcetimer.c:1592
-#, fuzzy
+#: ../src/xfcetimer.c:1637
 msgid "Default command: "
-msgstr "Comandu d'alarma"
+msgstr "Comandu por defeutu:"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1604
-#, fuzzy
+#: ../src/xfcetimer.c:1649
 msgid "Repeat the alarm command"
-msgstr "Repetir el comandu d'alarma:"
+msgstr "Repetir comandu d'alarma"
 
-#: ../src/xfcetimer.c:1611
+#: ../src/xfcetimer.c:1656
 msgid "Number of repetitions"
 msgstr "Númberu de repeticiones"