pidgin/pidgin

Clean up a some formatting

2019-11-15, Gary Kramlich
ee5349aa57ac
Parents 1341d8d2c10e
Children 34c97330b166
Clean up a some formatting
2 files changed, 24 insertions(+), 19 deletions(-)
  • +21 -16
    pidgin/gtkmenutray.c
  • +3 -3
    pidgin/gtkmenutray.h
    • --- a/pidgin/gtkmenutray.c Fri Nov 15 20:52:07 2019 -0600
    +++ b/pidgin/gtkmenutray.c Fri Nov 15 21:19:10 2019 -0600
    @@ -65,7 +65,7 @@
    static void
    pidgin_menu_tray_get_property(GObject *obj, guint param_id, GValue *value,
    - GParamSpec *pspec)
    + GParamSpec *pspec)
    {
    PidginMenuTray *menu_tray = PIDGIN_MENU_TRAY(obj);
    @@ -80,16 +80,14 @@
    }
    static void
    -pidgin_menu_tray_map(GtkWidget *widget)
    -{
    +pidgin_menu_tray_map(GtkWidget *widget) {
    GTK_WIDGET_CLASS(pidgin_menu_tray_parent_class)->map(widget);
    - gtk_container_add(GTK_CONTAINER(widget),
    - PIDGIN_MENU_TRAY(widget)->tray);
    +
    + gtk_container_add(GTK_CONTAINER(widget), PIDGIN_MENU_TRAY(widget)->tray);
    }
    static void
    -pidgin_menu_tray_finalize(GObject *obj)
    -{
    +pidgin_menu_tray_finalize(GObject *obj) {
    #if 0
    PidginMenuTray *tray = PIDGIN_MENU_TRAY(obj);
    @@ -139,8 +137,9 @@
    gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE);
    G_GNUC_END_IGNORE_DEPRECATIONS
    - if(!GTK_IS_WIDGET(menu_tray->tray))
    + if(!GTK_IS_WIDGET(menu_tray->tray)) {
    menu_tray->tray = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
    + }
    settings =
    gtk_settings_get_for_screen(gtk_widget_get_screen(widget));
    @@ -165,6 +164,7 @@
    GtkWidget *
    pidgin_menu_tray_get_box(PidginMenuTray *menu_tray) {
    g_return_val_if_fail(PIDGIN_IS_MENU_TRAY(menu_tray), NULL);
    +
    return menu_tray->tray;
    }
    @@ -175,8 +175,7 @@
    g_return_if_fail(PIDGIN_IS_MENU_TRAY(menu_tray));
    g_return_if_fail(GTK_IS_WIDGET(widget));
    - if (!gtk_widget_get_has_window(widget))
    - {
    + if (!gtk_widget_get_has_window(widget)) {
    GtkWidget *event;
    event = gtk_event_box_new();
    @@ -187,26 +186,30 @@
    pidgin_menu_tray_set_tooltip(menu_tray, widget, tooltip);
    - if (prepend)
    + if (prepend) {
    gtk_box_pack_start(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0);
    - else
    + } else {
    gtk_box_pack_end(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0);
    + }
    }
    void
    -pidgin_menu_tray_append(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
    +pidgin_menu_tray_append(PidginMenuTray *menu_tray, GtkWidget *widget,
    + const char *tooltip)
    {
    pidgin_menu_tray_add(menu_tray, widget, tooltip, FALSE);
    }
    void
    -pidgin_menu_tray_prepend(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
    +pidgin_menu_tray_prepend(PidginMenuTray *menu_tray, GtkWidget *widget,
    + const char *tooltip)
    {
    pidgin_menu_tray_add(menu_tray, widget, tooltip, TRUE);
    }
    void
    -pidgin_menu_tray_set_tooltip(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
    +pidgin_menu_tray_set_tooltip(PidginMenuTray *menu_tray, GtkWidget *widget,
    + const char *tooltip)
    {
    /* Should we check whether widget is a child of menu_tray? */
    @@ -217,8 +220,10 @@
    * case, we want to set the tooltip on the widget's parent,
    * not on the widget itself.
    */
    - if (!gtk_widget_get_has_window(widget))
    + if (!gtk_widget_get_has_window(widget)) {
    widget = gtk_widget_get_parent(widget);
    + }
    gtk_widget_set_tooltip_text(widget, tooltip);
    }
    +
    --- a/pidgin/gtkmenutray.h Fri Nov 15 20:52:07 2019 -0600
    +++ b/pidgin/gtkmenutray.h Fri Nov 15 21:19:10 2019 -0600
    @@ -64,7 +64,7 @@
    * pidgin_menu_tray_append:
    * @menu_tray: The tray
    * @widget: The widget
    - * @tooltip: The tooltip for this widget (widget requires its own X-window)
    + * @tooltip: The tooltip for this widget
    *
    * Appends a widget into the tray
    */
    @@ -74,7 +74,7 @@
    * pidgin_menu_tray_prepend:
    * @menu_tray: The tray
    * @widget: The widget
    - * @tooltip: The tooltip for this widget (widget requires its own X-window)
    + * @tooltip: The tooltip for this widget
    *
    * Prepends a widget into the tray
    */
    @@ -84,7 +84,7 @@
    * pidgin_menu_tray_set_tooltip:
    * @menu_tray: The tray
    * @widget: The widget
    - * @tooltip: The tooltip to set for the widget (widget requires its own X-window)
    + * @tooltip: The tooltip to set for the widget
    *
    * Set the tooltip for a widget
    */