Updating branch refs/heads/master to 2bc3ecf116fb5bfa7709fca27e5704b341f6f5af (commit) from 4b2e4b73cc33f8f4a9010556f6e4ac67094723d9 (commit)
commit 2bc3ecf116fb5bfa7709fca27e5704b341f6f5af Author: Ján Sučan <su...@runbox.com> Date: Fri Aug 30 13:11:45 2013 +0200 Use identifiers instead of magic numbers panel-plugin/mailwatch-plugin.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c index ff6c52b..3497ff9 100644 --- a/panel-plugin/mailwatch-plugin.c +++ b/panel-plugin/mailwatch-plugin.c @@ -39,9 +39,10 @@ #define BORDER 8 #define DEFAULT_LOG_LINES 500 -#define XFCE_MAILWATCH_RESPONSE_CLEAR 72347 #define DEFAULT_NORMAL_ICON "xfce-nomail" #define DEFAULT_NEW_MAIL_ICON "xfce-newmail" +#define MOUSE_BUTTON_LEFT 1 +#define MOUSE_BUTTON_MIDDLE 2 typedef struct { @@ -73,6 +74,12 @@ typedef struct } XfceMailwatchPlugin; enum { + ICON_TYPE_NORMAL, + ICON_TYPE_NEW_MAIL, + XFCE_MAILWATCH_RESPONSE_CLEAR +}; + +enum { LOGLIST_COLUMN_PIXBUF = 0, LOGLIST_COLUMN_TIME, LOGLIST_COLUMN_MESSAGE, @@ -174,14 +181,14 @@ mailwatch_button_release_cb(GtkWidget *w, GdkEventButton *evt, && evt->y < w->allocation.y + w->allocation.height) { switch(evt->button) { - case 1: /* left */ + case MOUSE_BUTTON_LEFT: if(mwp->click_command && *mwp->click_command) xfce_spawn_command_line_on_screen(gdk_screen_get_default(), mwp->click_command, FALSE, FALSE, NULL); break; - case 2: /* middle */ + case MOUSE_BUTTON_MIDDLE: xfce_mailwatch_force_update(mwp->mailwatch); break; } @@ -734,7 +741,7 @@ mailwatch_iconbtn_clicked_cb(GtkWidget *w, XfceMailwatchPlugin *mwp) "mailwatch-icontype")); GtkWidget *chooser, *toplevel; - g_return_if_fail(icon_type == 1 || icon_type == 2); + g_return_if_fail(icon_type == ICON_TYPE_NORMAL || icon_type == ICON_TYPE_NEW_MAIL); toplevel = gtk_widget_get_toplevel(w); chooser = gtk_file_chooser_dialog_new(_("Select Icon"), @@ -748,7 +755,7 @@ mailwatch_iconbtn_clicked_cb(GtkWidget *w, XfceMailwatchPlugin *mwp) gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser)); if(filename) { switch(icon_type) { - case 1: + case ICON_TYPE_NORMAL: { GtkWidget *vbox, *img, *lbl; @@ -774,7 +781,7 @@ mailwatch_iconbtn_clicked_cb(GtkWidget *w, XfceMailwatchPlugin *mwp) } break; - case 2: + case ICON_TYPE_NEW_MAIL: { GtkWidget *vbox, *img, *lbl; @@ -936,7 +943,8 @@ mailwatch_create_options(XfcePanelPlugin *plugin, XfceMailwatchPlugin *mwp) gtk_container_add(GTK_CONTAINER(frame_bin), hbox); btn = gtk_button_new(); - g_object_set_data(G_OBJECT(btn), "mailwatch-icontype", GINT_TO_POINTER(1)); + g_object_set_data(G_OBJECT(btn), "mailwatch-icontype", + GINT_TO_POINTER(ICON_TYPE_NORMAL)); gtk_widget_show(btn); gtk_box_pack_start(GTK_BOX(hbox), btn, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(btn), "clicked", @@ -956,7 +964,8 @@ mailwatch_create_options(XfcePanelPlugin *plugin, XfceMailwatchPlugin *mwp) gtk_box_pack_start(GTK_BOX(vbox), lbl, FALSE, FALSE, 0); btn = gtk_button_new(); - g_object_set_data(G_OBJECT(btn), "mailwatch-icontype", GINT_TO_POINTER(2)); + g_object_set_data(G_OBJECT(btn), "mailwatch-icontype", + GINT_TO_POINTER(ICON_TYPE_NEW_MAIL)); gtk_widget_show(btn); gtk_box_pack_start(GTK_BOX(hbox), btn, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(btn), "clicked", _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits