--- mainwin-callbacks.c 2007/07/23 22:11:32 1.1 +++ mainwin-callbacks.c 2007/07/23 22:16:34 @@ -1412,20 +1412,16 @@ { XfmediaMainwin *mwin = user_data; guint sig_id; - GtkToggleButton *btn; sig_id = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(w), "xfmedia-addmenu-deactivate-sigid")); g_signal_handler_disconnect(G_OBJECT(w), sig_id); - btn = g_object_get_data(G_OBJECT(w), "xfmedia-addmenu-button"); - gtk_toggle_button_set_active(btn, FALSE); - xfmedia_mainwin_enable_autohide(mwin); } void -xfmedia_mainwin_playlist_add_button_cb(GtkWidget *w, GtkToggleButton *button, +xfmedia_mainwin_playlist_add_button_cb(GtkWidget *w, GtkButton *button, gpointer user_data) { XfmediaMainwin *mwin = user_data; @@ -1433,14 +1429,10 @@ DBG("got add-clicked signal"); - if(!gtk_toggle_button_get_active(button)) - return; - sig_id = g_signal_connect(G_OBJECT(mwin->add_menu), "deactivate", G_CALLBACK(xfmedia_mainwin_add_menu_deactivate_cb), mwin); g_object_set_data(G_OBJECT(mwin->add_menu), "xfmedia-addmenu-deactivate-sigid", GUINT_TO_POINTER(sig_id)); - g_object_set_data(G_OBJECT(mwin->add_menu), "xfmedia-addmenu-button", button); gtk_menu_popup(GTK_MENU(mwin->add_menu), NULL, NULL, (GtkMenuPositionFunc)add_menu_position, button, 0, --- playlist.c 2007/07/23 22:05:47 1.1 +++ playlist.c 2007/07/23 22:14:37 @@ -265,7 +265,7 @@ XFMEDIA_TYPE_PLAYLIST, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(XfmediaPlaylistClass, add_button_clicked), NULL, NULL, playlist_marshal_VOID__TBUTTON, G_TYPE_NONE, 1, - GTK_TYPE_TOGGLE_BUTTON); + GTK_TYPE_BUTTON); } static void @@ -386,7 +386,7 @@ } static void -xfmedia_playlist_add_cb(GtkToggleButton *tb, gpointer user_data) +xfmedia_playlist_add_cb(GtkButton *tb, gpointer user_data) { XfmediaPlaylist *plist = user_data; @@ -1422,11 +1422,11 @@ img = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_widget_show(img); - btn = gtk_toggle_button_new(); + btn = gtk_button_new(); gtk_container_add(GTK_CONTAINER(btn), img); gtk_widget_show(btn); gtk_box_pack_start(GTK_BOX(hbox), btn, FALSE, FALSE, 0); - g_signal_connect(G_OBJECT(btn), "toggled", + g_signal_connect(G_OBJECT(btn), "pressed", G_CALLBACK(xfmedia_playlist_add_cb), plist); gtk_tooltips_set_tip(ttips, btn, _("Add entry to playlist"), NULL); --- xfmedia-internal.h 2007/07/23 22:12:20 1.1 +++ xfmedia-internal.h 2007/07/23 22:12:28 @@ -47,7 +47,7 @@ void xfmedia_mainwin_add_url_cb(GtkWidget *w, gpointer user_data); void xfmedia_mainwin_add_dir_cb(GtkWidget *w, gpointer user_data); void xfmedia_mainwin_add_file_cb(GtkWidget *w, gpointer user_data); -void xfmedia_mainwin_playlist_add_button_cb(GtkWidget *w, GtkToggleButton *button, gpointer user_data); +void xfmedia_mainwin_playlist_add_button_cb(GtkWidget *w, GtkButton *button, gpointer user_data); gboolean xfmedia_position_cb(gpointer user_data); void xfmedia_position_slider_cb(GtkWidget *w, gpointer user_data); gboolean xfmedia_pos_slider_btn_press_cb(GtkWidget *w, GdkEventButton *evt, gpointer user_data);