← Back to branch summary

~bratsche/indicator-sound/icon-placement

« back to all changes in this revision

Viewing changes to src/transport-widget.c

  • Committer: Conor Curran
  • Date: 2010-07-15 16:08:36 UTC
  • mfrom: (101.2.5 indicator-sound)
  • Revision ID: conor.curran@canonical.com-20100715160836-rodivhs9nbpd1lks
Tags: 0.3.7
merged the button press effect branch plus changes for the ido and bumped release version for 0.3.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/transport-widget.c
137
137
transport_widget_button_press_event (GtkWidget *menuitem, 
138
138
                                        GdkEventButton *event)
139
139
{
140
 
        if(IS_TRANSPORT_WIDGET(menuitem) == FALSE){
141
 
                return FALSE;
142
 
        }
 
140
        g_return_val_if_fail(IS_TRANSPORT_WIDGET(menuitem), FALSE);
143
141
 
144
142
        TransportWidgetPrivate * priv = TRANSPORT_WIDGET_GET_PRIVATE(TRANSPORT_WIDGET(menuitem));
145
143
 
147
145
 
148
146
  parent = gtk_widget_get_parent (GTK_WIDGET (menuitem));
149
147
 
150
 
        gint result = determine_button_event(priv->play_button, event);
 
148
        PlayButtonEvent result = determine_button_event(priv->play_button, event);
151
149
 
152
 
        GValue value = {0};
153
 
  g_value_init(&value, G_TYPE_INT);
154
 
        g_debug("TransportWidget::menu_press_event - going to send value %i", result);
155
 
        g_value_set_int(&value, result);        
156
 
        dbusmenu_menuitem_handle_event (priv->twin_item, "Transport state change", &value, 0);
157
 
        
 
150
        if(result != TRANSPORT_NADA){
 
151
                GValue value = {0};
 
152
                g_value_init(&value, G_TYPE_INT);
 
153
                g_debug("TransportWidget::menu_press_event - going to send value %i", (int)result);
 
154
                g_value_set_int(&value, (int)result);   
 
155
                dbusmenu_menuitem_handle_event (priv->twin_item, "Transport state change", &value, 0);
 
156
                play_button_react_to_button_press(priv->play_button, result);
 
157
        }       
158
158
        return TRUE;
159
159
}
160
160
 
164
164
                                  GdkEventButton *event)
165
165
{
166
166
        g_debug("TransportWidget::menu_release_event");
167
 
        if(IS_TRANSPORT_WIDGET(menuitem) == FALSE){
168
 
                return FALSE;
169
 
        }
 
167
        g_return_val_if_fail(IS_TRANSPORT_WIDGET(menuitem), FALSE);
 
168
        TransportWidgetPrivate * priv = TRANSPORT_WIDGET_GET_PRIVATE(TRANSPORT_WIDGET(menuitem));       
 
169
  play_button_react_to_button_release(priv->play_button);
170
170
        
171
171
        return TRUE;
172
172
}
180
180
                                 GValue* value, gpointer userdata)
181
181
{
182
182
        g_debug("transport_widget_update_state - with property  %s", property);  
183
 
        //int update_value = g_value_get_int(value);
184
 
        //g_debug("transport_widget_update_state - with value  %i", update_value);  
185
 
 
186
 
        //TransportWidget* bar = (TransportWidget*)userdata;
187
 
        //TransportWidgetPrivate *priv = TRANSPORT_WIDGET_GET_PRIVATE(bar);
 
183
        TransportWidget* bar = (TransportWidget*)userdata;
 
184
        g_return_if_fail(IS_TRANSPORT_WIDGET(bar));
188
185
        
 
186
        TransportWidgetPrivate *priv = TRANSPORT_WIDGET_GET_PRIVATE(bar);
 
187
        int update_value = g_value_get_int(value);
 
188
        g_debug("transport_widget_update_state - with value  %i", update_value);  
 
189
        play_button_toggle_play_pause(priv->play_button, update_value);
189
190
}
190
191
 
191
192
 /**