diff options
Diffstat (limited to 'geyes/src/geyes.c')
| -rw-r--r-- | geyes/src/geyes.c | 663 |
1 files changed, 339 insertions, 324 deletions
diff --git a/geyes/src/geyes.c b/geyes/src/geyes.c index 27fbdfed..6bdf49b1 100644 --- a/geyes/src/geyes.c +++ b/geyes/src/geyes.c @@ -29,436 +29,451 @@ static gfloat gtk_align_to_gfloat (GtkAlign align) { - switch (align) { - case GTK_ALIGN_START: - return 0.0; - case GTK_ALIGN_END: - return 1.0; - case GTK_ALIGN_CENTER: - case GTK_ALIGN_FILL: - return 0.5; - default: - return 0.0; - } + switch (align) { + case GTK_ALIGN_START: + return 0.0; + case GTK_ALIGN_END: + return 1.0; + case GTK_ALIGN_CENTER: + case GTK_ALIGN_FILL: + return 0.5; + default: + return 0.0; + } } /* TODO - Optimize this a bit */ static void calculate_pupil_xy (EyesApplet *eyes_applet, - gint x, gint y, - gint *pupil_x, gint *pupil_y, GtkWidget* widget) + gint x, + gint y, + gint *pupil_x, + gint *pupil_y, + GtkWidget *widget) { - GtkAllocation allocation; - double sina; - double cosa; - double h; - double temp; - double nx, ny; - - gfloat xalign, yalign; - gint width, height; - - gtk_widget_get_allocation (GTK_WIDGET(widget), &allocation); - width = allocation.width; - height = allocation.height; - xalign = gtk_align_to_gfloat (gtk_widget_get_halign (widget)); - yalign = gtk_align_to_gfloat (gtk_widget_get_valign (widget)); - - nx = x - MAX(width - eyes_applet->eye_width, 0) * xalign - eyes_applet->eye_width / 2; - ny = y - MAX(height- eyes_applet->eye_height, 0) * yalign - eyes_applet->eye_height / 2; - - h = hypot (nx, ny); - if (h < 0.5 || fabs (h) - < (fabs (hypot (eyes_applet->eye_height / 2, eyes_applet->eye_width / 2)) - eyes_applet->wall_thickness - eyes_applet->pupil_height)) { - *pupil_x = nx + eyes_applet->eye_width / 2; - *pupil_y = ny + eyes_applet->eye_height / 2; - return; - } - - sina = nx / h; - cosa = ny / h; - - temp = hypot ((eyes_applet->eye_width / 2) * sina, (eyes_applet->eye_height / 2) * cosa); - temp -= hypot ((eyes_applet->pupil_width / 2) * sina, (eyes_applet->pupil_height / 2) * cosa); - temp -= hypot ((eyes_applet->wall_thickness / 2) * sina, (eyes_applet->wall_thickness / 2) * cosa); - - *pupil_x = temp * sina + (eyes_applet->eye_width / 2); - *pupil_y = temp * cosa + (eyes_applet->eye_height / 2); + GtkAllocation allocation; + double sina; + double cosa; + double h; + double temp; + double nx, ny; + + gfloat xalign, yalign; + gint width, height; + + gtk_widget_get_allocation (GTK_WIDGET (widget), &allocation); + width = allocation.width; + height = allocation.height; + xalign = gtk_align_to_gfloat (gtk_widget_get_halign (widget)); + yalign = gtk_align_to_gfloat (gtk_widget_get_valign (widget)); + + nx = x - MAX (width - eyes_applet->eye_width, 0) * xalign + - eyes_applet->eye_width / 2; + ny = y - MAX (height - eyes_applet->eye_height, 0) * yalign + - eyes_applet->eye_height / 2; + + h = hypot (nx, ny); + if (h < 0.5 + || fabs (h) + < (fabs (hypot (eyes_applet->eye_height / 2, + eyes_applet->eye_width / 2)) + - eyes_applet->wall_thickness + - eyes_applet->pupil_height)) { + *pupil_x = nx + eyes_applet->eye_width / 2; + *pupil_y = ny + eyes_applet->eye_height / 2; + return; + } + + sina = nx / h; + cosa = ny / h; + + temp = hypot ((eyes_applet->eye_width / 2) * sina, + (eyes_applet->eye_height / 2) * cosa); + temp -= hypot ((eyes_applet->pupil_width / 2) * sina, + (eyes_applet->pupil_height / 2) * cosa); + temp -= hypot ((eyes_applet->wall_thickness / 2) * sina, + (eyes_applet->wall_thickness / 2) * cosa); + + *pupil_x = temp * sina + (eyes_applet->eye_width / 2); + *pupil_y = temp * cosa + (eyes_applet->eye_height / 2); } static void draw_eye (EyesApplet *eyes_applet, - gint eye_num, - gint pupil_x, - gint pupil_y) + gint eye_num, + gint pupil_x, + gint pupil_y) { - GdkPixbuf *pixbuf; - GdkRectangle rect, r1, r2; - - pixbuf = gdk_pixbuf_copy (eyes_applet->eye_image); - r1.x = pupil_x - eyes_applet->pupil_width / 2; - r1.y = pupil_y - eyes_applet->pupil_height / 2; - r1.width = eyes_applet->pupil_width; - r1.height = eyes_applet->pupil_height; - r2.x = 0; - r2.y = 0; - r2.width = eyes_applet->eye_width; - r2.height = eyes_applet->eye_height; - gdk_rectangle_intersect (&r1, &r2, &rect); - gdk_pixbuf_composite (eyes_applet->pupil_image, pixbuf, - rect.x, - rect.y, - rect.width, - rect.height, - pupil_x - eyes_applet->pupil_width / 2, - pupil_y - eyes_applet->pupil_height / 2, 1.0, 1.0, - GDK_INTERP_BILINEAR, - 255); - gtk_image_set_from_pixbuf (GTK_IMAGE (eyes_applet->eyes[eye_num]), - pixbuf); - g_object_unref (pixbuf); + GdkPixbuf *pixbuf; + GdkRectangle rect, r1, r2; + + pixbuf = gdk_pixbuf_copy (eyes_applet->eye_image); + r1.x = pupil_x - eyes_applet->pupil_width / 2; + r1.y = pupil_y - eyes_applet->pupil_height / 2; + r1.width = eyes_applet->pupil_width; + r1.height = eyes_applet->pupil_height; + r2.x = 0; + r2.y = 0; + r2.width = eyes_applet->eye_width; + r2.height = eyes_applet->eye_height; + gdk_rectangle_intersect (&r1, &r2, &rect); + gdk_pixbuf_composite (eyes_applet->pupil_image, pixbuf, + rect.x, rect.y, + rect.width, rect.height, + pupil_x - eyes_applet->pupil_width / 2, + pupil_y - eyes_applet->pupil_height / 2, + 1.0, 1.0, + GDK_INTERP_BILINEAR, + 255); + gtk_image_set_from_pixbuf (GTK_IMAGE (eyes_applet->eyes[eye_num]), pixbuf); + g_object_unref (pixbuf); } static gint timer_cb (EyesApplet *eyes_applet) { - GdkDisplay *display; - GdkSeat *seat; - gint x, y; - gint pupil_x, pupil_y; - gint i; + GdkDisplay *display; + GdkSeat *seat; + gint x, y; + gint pupil_x, pupil_y; + gint i; - display = gtk_widget_get_display (GTK_WIDGET (eyes_applet->applet)); - seat = gdk_display_get_default_seat (display); + display = gtk_widget_get_display (GTK_WIDGET (eyes_applet->applet)); + seat = gdk_display_get_default_seat (display); - for (i = 0; i < eyes_applet->num_eyes; i++) { - if (gtk_widget_get_realized (eyes_applet->eyes[i])) { + for (i = 0; i < eyes_applet->num_eyes; i++) { + if (gtk_widget_get_realized (eyes_applet->eyes[i])) { gdk_window_get_device_position (gtk_widget_get_window (eyes_applet->eyes[i]), gdk_seat_get_pointer (seat), &x, &y, NULL); - if ((x != eyes_applet->pointer_last_x[i]) || (y != eyes_applet->pointer_last_y[i])) { + if ((x != eyes_applet->pointer_last_x[i]) || + (y != eyes_applet->pointer_last_y[i])) { - calculate_pupil_xy (eyes_applet, x, y, &pupil_x, &pupil_y, eyes_applet->eyes[i]); - draw_eye (eyes_applet, i, pupil_x, pupil_y); + calculate_pupil_xy (eyes_applet, x, y, &pupil_x, &pupil_y, + eyes_applet->eyes[i]); + draw_eye (eyes_applet, i, pupil_x, pupil_y); - eyes_applet->pointer_last_x[i] = x; - eyes_applet->pointer_last_y[i] = y; - } - } + eyes_applet->pointer_last_x[i] = x; + eyes_applet->pointer_last_y[i] = y; + } } - return TRUE; + } + return TRUE; } static void -about_cb (GtkAction *action, - EyesApplet *eyes_applet) +about_cb (GtkAction *action, + EyesApplet *eyes_applet) { - static const gchar *authors [] = { - "Dave Camp <[email protected]>", - NULL - }; - - const gchar *documenters[] = { - "Arjan Scherpenisse <[email protected]>", - "Telsa Gwynne <[email protected]>", - N_("Sun GNOME Documentation Team <[email protected]>"), - N_("MATE Documentation Team"), - NULL - }; + static const gchar *authors[] = { + "Dave Camp <[email protected]>", + NULL + }; + + const gchar *documenters[] = { + "Arjan Scherpenisse <[email protected]>", + "Telsa Gwynne <[email protected]>", + N_("Sun GNOME Documentation Team <[email protected]>"), + N_("MATE Documentation Team"), + NULL + }; #ifdef ENABLE_NLS - const char **p; - for (p = documenters; *p; ++p) - *p = _(*p); + const char **p; + for (p = documenters; *p; ++p) + *p = _(*p); #endif - gtk_show_about_dialog (NULL, - "title", _("About Eyes"), - "version", VERSION, - "comments", _("A goofy set of eyes for the MATE " - "panel. They follow your mouse."), - "copyright", _("Copyright \xC2\xA9 1999 Dave Camp\n" - "Copyright \xc2\xa9 2012-2020 MATE developers"), - "authors", authors, - "documenters", documenters, - "translator-credits", _("translator-credits"), - "logo-icon-name", "mate-eyes-applet", - NULL); + gtk_show_about_dialog (NULL, + "title", _("About Eyes"), + "version", VERSION, + "comments", _("A goofy set of eyes for the MATE " + "panel. They follow your mouse."), + "copyright", _("Copyright \xC2\xA9 1999 Dave Camp\n" + "Copyright \xc2\xa9 2012-2020 MATE developers"), + "authors", authors, + "documenters", documenters, + "translator-credits", _("translator-credits"), + "logo-icon-name", "mate-eyes-applet", + NULL); } static int properties_load (EyesApplet *eyes_applet) { - gchar *theme_path = NULL; + gchar *theme_path = NULL; - theme_path = g_settings_get_string (eyes_applet->settings, "theme-path"); + theme_path = g_settings_get_string (eyes_applet->settings, "theme-path"); - if (theme_path == NULL) - theme_path = g_strdup (GEYES_THEMES_DIR "Default-tiny"); - - if (load_theme (eyes_applet, theme_path) == FALSE) { - g_free (theme_path); - - return FALSE; - } + if (theme_path == NULL) + theme_path = g_strdup (GEYES_THEMES_DIR "Default-tiny"); + if (load_theme (eyes_applet, theme_path) == FALSE) { g_free (theme_path); + return FALSE; + } - return TRUE; + g_free (theme_path); + return TRUE; } void setup_eyes (EyesApplet *eyes_applet) { - int i; - - eyes_applet->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (eyes_applet->vbox), eyes_applet->hbox, TRUE, TRUE, 0); - - eyes_applet->eyes = g_new0 (GtkWidget *, eyes_applet->num_eyes); - eyes_applet->pointer_last_x = g_new0 (gint, eyes_applet->num_eyes); - eyes_applet->pointer_last_y = g_new0 (gint, eyes_applet->num_eyes); - - for (i = 0; i < eyes_applet->num_eyes; i++) { - eyes_applet->eyes[i] = gtk_image_new (); - if (eyes_applet->eyes[i] == NULL) - g_error ("Error creating geyes\n"); - - gtk_widget_set_size_request (GTK_WIDGET (eyes_applet->eyes[i]), - eyes_applet->eye_width, - eyes_applet->eye_height); - - gtk_widget_show (eyes_applet->eyes[i]); - - gtk_box_pack_start (GTK_BOX (eyes_applet->hbox), - eyes_applet->eyes [i], - TRUE, - TRUE, - 0); - - if ((eyes_applet->num_eyes != 1) && (i == 0)) { - gtk_widget_set_halign (eyes_applet->eyes[i], GTK_ALIGN_END); - gtk_widget_set_valign (eyes_applet->eyes[i], GTK_ALIGN_CENTER); - } - else if ((eyes_applet->num_eyes != 1) && (i == eyes_applet->num_eyes - 1)) { - gtk_widget_set_halign (eyes_applet->eyes[i], GTK_ALIGN_START); - gtk_widget_set_valign (eyes_applet->eyes[i], GTK_ALIGN_CENTER); - } - else { - gtk_widget_set_halign (eyes_applet->eyes[i], GTK_ALIGN_CENTER); - gtk_widget_set_valign (eyes_applet->eyes[i], GTK_ALIGN_CENTER); - } - - gtk_widget_realize (eyes_applet->eyes[i]); - - eyes_applet->pointer_last_x[i] = G_MAXINT; - eyes_applet->pointer_last_y[i] = G_MAXINT; - - draw_eye (eyes_applet, i, - eyes_applet->eye_width / 2, - eyes_applet->eye_height / 2); - + int i; + + eyes_applet->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_pack_start (GTK_BOX (eyes_applet->vbox), eyes_applet->hbox, TRUE, + TRUE, 0); + + eyes_applet->eyes = g_new0 (GtkWidget *, eyes_applet->num_eyes); + eyes_applet->pointer_last_x = g_new0 (gint, eyes_applet->num_eyes); + eyes_applet->pointer_last_y = g_new0 (gint, eyes_applet->num_eyes); + + for (i = 0; i < eyes_applet->num_eyes; i++) { + if ((eyes_applet->eyes[i] = gtk_image_new ()) == NULL) + g_error ("Error creating geyes\n"); + + gtk_widget_set_size_request (GTK_WIDGET (eyes_applet->eyes[i]), + eyes_applet->eye_width, + eyes_applet->eye_height); + + gtk_widget_show (eyes_applet->eyes[i]); + + gtk_box_pack_start (GTK_BOX (eyes_applet->hbox), eyes_applet->eyes[i], + TRUE, TRUE, 0); + + if ((eyes_applet->num_eyes != 1) && (i == 0)) { + gtk_widget_set_halign (eyes_applet->eyes[i], GTK_ALIGN_END); + gtk_widget_set_valign (eyes_applet->eyes[i], GTK_ALIGN_CENTER); + } else if ((eyes_applet->num_eyes != 1) && + (i == eyes_applet->num_eyes - 1)) { + gtk_widget_set_halign (eyes_applet->eyes[i], GTK_ALIGN_START); + gtk_widget_set_valign (eyes_applet->eyes[i], GTK_ALIGN_CENTER); + } else { + gtk_widget_set_halign (eyes_applet->eyes[i], GTK_ALIGN_CENTER); + gtk_widget_set_valign (eyes_applet->eyes[i], GTK_ALIGN_CENTER); } - gtk_widget_show (eyes_applet->hbox); + + gtk_widget_realize (eyes_applet->eyes[i]); + + eyes_applet->pointer_last_x[i] = G_MAXINT; + eyes_applet->pointer_last_y[i] = G_MAXINT; + + draw_eye (eyes_applet, i, eyes_applet->eye_width / 2, + eyes_applet->eye_height / 2); + + } + gtk_widget_show (eyes_applet->hbox); } void destroy_eyes (EyesApplet *eyes_applet) { - gtk_widget_destroy (eyes_applet->hbox); - eyes_applet->hbox = NULL; + gtk_widget_destroy (eyes_applet->hbox); + eyes_applet->hbox = NULL; - g_free (eyes_applet->eyes); - g_free (eyes_applet->pointer_last_x); - g_free (eyes_applet->pointer_last_y); + g_free (eyes_applet->eyes); + g_free (eyes_applet->pointer_last_x); + g_free (eyes_applet->pointer_last_y); } -static EyesApplet * +static EyesApplet* create_eyes (MatePanelApplet *applet) { - EyesApplet *eyes_applet = g_new0 (EyesApplet, 1); - - eyes_applet->applet = applet; - eyes_applet->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - eyes_applet->settings = - mate_panel_applet_settings_new (applet, "org.mate.panel.applet.geyes"); - - gtk_container_add (GTK_CONTAINER (applet), eyes_applet->vbox); - - return eyes_applet; + EyesApplet *eyes_applet = g_new0 (EyesApplet, 1); + + eyes_applet->applet = applet; + eyes_applet->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + eyes_applet->settings = + mate_panel_applet_settings_new (applet, + "org.mate.panel.applet.geyes"); + gtk_container_add (GTK_CONTAINER (applet), eyes_applet->vbox); + return eyes_applet; } static void -destroy_cb (GObject *object, EyesApplet *eyes_applet) +destroy_cb (GObject *object, + EyesApplet *eyes_applet) { - g_return_if_fail (eyes_applet); - - g_source_remove (eyes_applet->timeout_id); - if (eyes_applet->hbox) - destroy_eyes (eyes_applet); - eyes_applet->timeout_id = 0; - if (eyes_applet->eye_image) - g_object_unref (eyes_applet->eye_image); - eyes_applet->eye_image = NULL; - if (eyes_applet->pupil_image) - g_object_unref (eyes_applet->pupil_image); - eyes_applet->pupil_image = NULL; - if (eyes_applet->theme_dir) - g_free (eyes_applet->theme_dir); - eyes_applet->theme_dir = NULL; - if (eyes_applet->theme_name) - g_free (eyes_applet->theme_name); - eyes_applet->theme_name = NULL; - if (eyes_applet->eye_filename) - g_free (eyes_applet->eye_filename); - eyes_applet->eye_filename = NULL; - if (eyes_applet->pupil_filename) - g_free (eyes_applet->pupil_filename); - eyes_applet->pupil_filename = NULL; - - if (eyes_applet->prop_box.pbox) - gtk_widget_destroy (eyes_applet->prop_box.pbox); - - if (eyes_applet->settings) - g_object_unref (eyes_applet->settings); - eyes_applet->settings = NULL; - - g_free (eyes_applet); + g_return_if_fail (eyes_applet); + + g_source_remove (eyes_applet->timeout_id); + + if (eyes_applet->hbox) + destroy_eyes (eyes_applet); + eyes_applet->timeout_id = 0; + + if (eyes_applet->eye_image) + g_object_unref (eyes_applet->eye_image); + eyes_applet->eye_image = NULL; + + if (eyes_applet->pupil_image) + g_object_unref (eyes_applet->pupil_image); + eyes_applet->pupil_image = NULL; + + if (eyes_applet->theme_dir) + g_free (eyes_applet->theme_dir); + eyes_applet->theme_dir = NULL; + + if (eyes_applet->theme_name) + g_free (eyes_applet->theme_name); + eyes_applet->theme_name = NULL; + + if (eyes_applet->eye_filename) + g_free (eyes_applet->eye_filename); + eyes_applet->eye_filename = NULL; + + if (eyes_applet->pupil_filename) + g_free (eyes_applet->pupil_filename); + eyes_applet->pupil_filename = NULL; + + if (eyes_applet->prop_box.pbox) + gtk_widget_destroy (eyes_applet->prop_box.pbox); + + if (eyes_applet->settings) + g_object_unref (eyes_applet->settings); + eyes_applet->settings = NULL; + + g_free (eyes_applet); } static void help_cb (GtkAction *action, - EyesApplet *eyes_applet) + EyesApplet *eyes_applet) { - GError *error = NULL; - - gtk_show_uri_on_window (NULL, - "help:mate-geyes", - gtk_get_current_event_time (), - &error); - - if (error) { - GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - _("There was an error displaying help: %s"), error->message); - g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), NULL); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (GTK_WIDGET (eyes_applet->applet))); - gtk_widget_show (dialog); - g_error_free (error); - error = NULL; - } + GError *error = NULL; + + gtk_show_uri_on_window (NULL, "help:mate-geyes", + gtk_get_current_event_time (), + &error); + + if (error) { + GtkWidget *dialog + = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + _("There was an error displaying help: %s"), + error->message); + g_signal_connect (G_OBJECT (dialog), "response", + G_CALLBACK (gtk_widget_destroy), + NULL); + gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); + gtk_window_set_screen (GTK_WINDOW (dialog), + gtk_widget_get_screen (GTK_WIDGET (eyes_applet->applet))); + gtk_widget_show (dialog); + g_error_free (error); + error = NULL; + } } - -static const GtkActionEntry geyes_applet_menu_actions [] = { - { "Props", "document-properties", N_("_Preferences"), - NULL, NULL, - G_CALLBACK (properties_cb) }, - { "Help", "help-browser", N_("_Help"), - NULL, NULL, - G_CALLBACK (help_cb) }, - { "About", "help-about", N_("_About"), - NULL, NULL, - G_CALLBACK (about_cb) } +static const GtkActionEntry geyes_applet_menu_actions[] = { + { "Props", "document-properties", N_("_Preferences"), + NULL, NULL, G_CALLBACK (properties_cb) }, + { "Help", "help-browser", N_("_Help"), + NULL, NULL, G_CALLBACK (help_cb) }, + { "About", "help-about", N_("_About"), + NULL, NULL, G_CALLBACK (about_cb) } }; static void -set_atk_name_description (GtkWidget *widget, const gchar *name, - const gchar *description) +set_atk_name_description (GtkWidget *widget, + const gchar *name, + const gchar *description) { - AtkObject *aobj; + AtkObject *aobj; + + aobj = gtk_widget_get_accessible (widget); - aobj = gtk_widget_get_accessible (widget); - /* Check if gail is loaded */ - if (GTK_IS_ACCESSIBLE (aobj) == FALSE) - return; + /* Check if gail is loaded */ + if (GTK_IS_ACCESSIBLE (aobj) == FALSE) + return; - atk_object_set_name (aobj, name); - atk_object_set_description (aobj, description); + atk_object_set_name (aobj, name); + atk_object_set_description (aobj, description); } static gboolean geyes_applet_fill (MatePanelApplet *applet) { - EyesApplet *eyes_applet; - GtkActionGroup *action_group; - - g_set_application_name (_("Eyes")); + EyesApplet *eyes_applet; + GtkActionGroup *action_group; - gtk_window_set_default_icon_name ("mate-eyes-applet"); - mate_panel_applet_set_flags (applet, MATE_PANEL_APPLET_EXPAND_MINOR); + g_set_application_name (_("Eyes")); + gtk_window_set_default_icon_name ("mate-eyes-applet"); + mate_panel_applet_set_flags (applet, MATE_PANEL_APPLET_EXPAND_MINOR); - eyes_applet = create_eyes (applet); + eyes_applet = create_eyes (applet); - eyes_applet->timeout_id = g_timeout_add ( - UPDATE_TIMEOUT, (GSourceFunc) timer_cb, eyes_applet); + eyes_applet->timeout_id = g_timeout_add (UPDATE_TIMEOUT, + (GSourceFunc) timer_cb, + eyes_applet); - action_group = gtk_action_group_new ("Geyes Applet Actions"); - gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); + action_group = gtk_action_group_new ("Geyes Applet Actions"); + gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); - gtk_action_group_add_actions (action_group, - geyes_applet_menu_actions, - G_N_ELEMENTS (geyes_applet_menu_actions), - eyes_applet); + gtk_action_group_add_actions (action_group, geyes_applet_menu_actions, + G_N_ELEMENTS (geyes_applet_menu_actions), + eyes_applet); - mate_panel_applet_setup_menu_from_resource (eyes_applet->applet, - GEYES_RESOURCE_PATH "geyes-applet-menu.xml", - action_group); + mate_panel_applet_setup_menu_from_resource (eyes_applet->applet, + GEYES_RESOURCE_PATH "geyes-applet-menu.xml", + action_group); - if (mate_panel_applet_get_locked_down (eyes_applet->applet)) { - GtkAction *action; + if (mate_panel_applet_get_locked_down (eyes_applet->applet)) { + GtkAction *action; - action = gtk_action_group_get_action (action_group, "Props"); - gtk_action_set_visible (action, FALSE); - } - g_object_unref (action_group); + action = gtk_action_group_get_action (action_group, "Props"); + gtk_action_set_visible (action, FALSE); + } + g_object_unref (action_group); - gtk_widget_set_tooltip_text (GTK_WIDGET (eyes_applet->applet), _("Eyes")); + gtk_widget_set_tooltip_text (GTK_WIDGET (eyes_applet->applet), _("Eyes")); - set_atk_name_description (GTK_WIDGET (eyes_applet->applet), _("Eyes"), - _("The eyes look in the direction of the mouse pointer")); + set_atk_name_description (GTK_WIDGET (eyes_applet->applet), _("Eyes"), + _("The eyes look in the direction of the mouse pointer")); - g_signal_connect (eyes_applet->vbox, - "destroy", - G_CALLBACK (destroy_cb), - eyes_applet); + g_signal_connect (eyes_applet->vbox, + "destroy", + G_CALLBACK (destroy_cb), + eyes_applet); - gtk_widget_show_all (GTK_WIDGET (eyes_applet->applet)); + gtk_widget_show_all (GTK_WIDGET (eyes_applet->applet)); - /* setup here and not in create eyes so the destroy signal is set so - * that when there is an error within loading the theme - * we can emit this signal */ - if (properties_load (eyes_applet) == FALSE) - return FALSE; + /* setup here and not in create eyes so the destroy signal is set so + * that when there is an error within loading the theme + * we can emit this signal */ + if (properties_load (eyes_applet) == FALSE) + return FALSE; - setup_eyes (eyes_applet); + setup_eyes (eyes_applet); - return TRUE; + return TRUE; } static gboolean geyes_applet_factory (MatePanelApplet *applet, - const gchar *iid, - gpointer data) + const gchar *iid, + gpointer data) { - gboolean retval = FALSE; + gboolean retval = FALSE; - theme_dirs_create (); + theme_dirs_create (); - if (!strcmp (iid, "GeyesApplet")) - retval = geyes_applet_fill (applet); + if (!strcmp (iid, "GeyesApplet")) + retval = geyes_applet_fill (applet); - if (retval == FALSE) { - exit (-1); - } + if (retval == FALSE) { + exit (-1); + } - return retval; + return retval; } MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("GeyesAppletFactory", - PANEL_TYPE_APPLET, - "geyes", - geyes_applet_factory, - NULL) + PANEL_TYPE_APPLET, + "geyes", + geyes_applet_factory, + NULL) |