Skip to content

Commit

Permalink
fixed gnome applet
Browse files Browse the repository at this point in the history 
git-svn-id: https://workrave.svn.sourceforge.net/svnroot/workrave/workrave/workrave/trunk@1176 2b0e655b-6f86-497a-824e-95ef0e1e0d90
  • Loading branch information
@rcaelers
rcaelers committed Apr 29, 2007
1 parent f18b8c0 commit d98bb83
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 19 deletions.
2 changes: 1 addition & 1 deletion common/src/Util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Util::get_home_directory()
ret = home;
ret += "/.workrave/";

mkdir(ret.c_str(), 0777);
mkdir(ret.c_str(), 0700);
}
#elif defined(WIN32)
void *pidl;
Expand Down
2 changes: 1 addition & 1 deletion config.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0"?>
<workrave><distribution port="27273" reconnect_attempts="5" reconnect_interval="15"/><gui operation-mode="2"><applet cycle_time="10"><daily_limit position="1"/><micro_pause position="0"/><rest_break position="0"/></applet><breaks block_mode="0"><daily_limit enabled="1" exercises="0" ignorable_break="1" max_postpone="-1" max_preludes="3"/><micro_pause enabled="1" exercises="0" ignorable_break="1" max_postpone="-1" max_preludes="3"/><rest_break enabled="1" exercises="3" ignorable_break="1" max_postpone="-1" max_preludes="3"/></breaks><main_window cycle_time="10" enabled="1" head="0" x="4" y="27"/></gui><timers><daily_limit activity_sensitive="1" auto_reset="0" limit="14400" reset_pred="day/4:00" snooze="1200"/><micro_pause activity_sensitive="1" auto_reset="30" limit="39" reset_pred="" snooze="150"/><rest_break activity_sensitive="1" auto_reset="600" limit="2700" reset_pred="" snooze="180"/></timers></workrave>
<workrave><distribution port="27273" reconnect_attempts="5" reconnect_interval="15"/><gui operation-mode="2"><applet cycle_time="10"><daily_limit position="1"/><micro_pause position="0"/><rest_break position="0"/></applet><breaks block_mode="0"><daily_limit enabled="1" exercises="0" ignorable_break="1" max_postpone="-1" max_preludes="3"/><micro_pause enabled="1" exercises="0" ignorable_break="1" max_postpone="-1" max_preludes="3"/><rest_break enabled="1" exercises="3" ignorable_break="1" max_postpone="-1" max_preludes="3"/></breaks><main_window cycle_time="10" enabled="1" head="0" x="5" y="49"/></gui><timers><daily_limit activity_sensitive="1" auto_reset="0" limit="14400" reset_pred="day/4:00" snooze="1200"/><micro_pause activity_sensitive="1" auto_reset="30" limit="39" reset_pred="" snooze="150"/><rest_break activity_sensitive="1" auto_reset="600" limit="2700" reset_pred="" snooze="180"/></timers></workrave>
7 changes: 7 additions & 0 deletions frontend/gtkmm/src/GnomeAppletWindow.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@ GnomeAppletWindow::activate_applet()

CORBA_exception_free(&ev);
}

if (ok)
{
applet_active = true;
}

TRACE_EXIT();
return ok ?
Expand Down Expand Up @@ -243,6 +248,7 @@ GnomeAppletWindow::fire_gnome_applet()
void
GnomeAppletWindow::set_applet_control(GNOME_Workrave_AppletControl applet_control)
{
TRACE_ENTER("GnomeAppletWindow::set_applet_control");
if (this->applet_control != NULL)
{
// FIXME: free old interface
Expand All @@ -251,6 +257,7 @@ GnomeAppletWindow::set_applet_control(GNOME_Workrave_AppletControl applet_contro
this->applet_control = applet_control;

control->show(AppletControl::APPLET_GNOME);
TRACE_EXIT();
}


Expand Down
11 changes: 11 additions & 0 deletions frontend/gtkmm/src/TimerBoxGtkView.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,17 @@ TimerBoxGtkView::set_time_bar(BreakId id,
int secondary_val, int secondary_max)
{
TRACE_ENTER_MSG("TimerBoxGtkView::set_time_bar", id);

char str[100];
static int xx = 0;

if (id == 0)
{
xx++;
sprintf(str, "%d", xx);
text = string(str);
}

TRACE_MSG(text);
TRACE_MSG(primary_val << " " << primary_max << " " << int(primary_color));
TRACE_MSG(secondary_val << " " << secondary_max <<" " << int(secondary_color));
Expand Down
34 changes: 17 additions & 17 deletions frontend/gtkmm/src/gnome_applet/WorkraveApplet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ workrave_applet_fire_workrave()
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}
else
Expand Down Expand Up @@ -397,7 +397,7 @@ verb_open(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}

Expand All @@ -421,7 +421,7 @@ verb_preferences(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}
CORBA_exception_free(&ev);
Expand All @@ -445,7 +445,7 @@ verb_exercises(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}
CORBA_exception_free(&ev);
Expand All @@ -468,7 +468,7 @@ verb_statistics(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}
CORBA_exception_free(&ev);
Expand All @@ -491,7 +491,7 @@ verb_restbreak(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}
CORBA_exception_free(&ev);
Expand All @@ -515,7 +515,7 @@ verb_connect(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}
CORBA_exception_free(&ev);
Expand All @@ -538,7 +538,7 @@ verb_disconnect(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}
CORBA_exception_free(&ev);
Expand All @@ -560,7 +560,7 @@ verb_reconnect(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}
CORBA_exception_free(&ev);
Expand All @@ -584,7 +584,7 @@ verb_quit(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}
CORBA_exception_free(&ev);
Expand Down Expand Up @@ -627,7 +627,7 @@ change_pixel_size(PanelApplet *applet, gint size, gpointer data)
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}

Expand Down Expand Up @@ -667,7 +667,7 @@ change_orient(PanelApplet *applet, PanelAppletOrient o, gpointer data)
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}

Expand Down Expand Up @@ -725,7 +725,7 @@ change_background (PanelApplet * widget,
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}

Expand Down Expand Up @@ -772,7 +772,7 @@ button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer data)
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}

Expand Down Expand Up @@ -814,7 +814,7 @@ showlog_callback(BonoboUIComponent *ui, const char *path, Bonobo_UIComponent_Eve
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}

Expand Down Expand Up @@ -870,7 +870,7 @@ mode_callback(BonoboUIComponent *ui, const char *path, Bonobo_UIComponent_EventT
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}

Expand Down Expand Up @@ -986,7 +986,7 @@ void size_allocate(GtkWidget *widget,
if (BONOBO_EX(&ev))
{
char *err = (char *) bonobo_exception_get_text(&ev);
g_warning (_("An exception occured '%s'"), err);
g_warning (_("An exception occurred '%s'"), err);
g_free(err);
}

Expand Down

0 comments on commit d98bb83

Please sign in to comment.