[Goodies-commits] r7673 - in xfmpc/trunk: . src
Vincent Legout
vincent at xfce.org
Sat Jul 4 17:27:58 CEST 2009
Author: vincent
Date: 2009-07-04 15:27:58 +0000 (Sat, 04 Jul 2009)
New Revision: 7673
Modified:
xfmpc/trunk/ChangeLog
xfmpc/trunk/src/dbbrowser.c
xfmpc/trunk/src/dbbrowser.vala
xfmpc/trunk/src/extended-interface.c
xfmpc/trunk/src/extended-interface.vala
xfmpc/trunk/src/interface.c
xfmpc/trunk/src/interface.vala
xfmpc/trunk/src/main-window.c
xfmpc/trunk/src/main-window.vala
xfmpc/trunk/src/playlist.c
xfmpc/trunk/src/playlist.vala
xfmpc/trunk/src/preferences-dialog.c
xfmpc/trunk/src/preferences-dialog.vala
xfmpc/trunk/src/song-dialog.c
xfmpc/trunk/src/song-dialog.vala
Log:
Switch to the new signal connect syntax
Modified: xfmpc/trunk/ChangeLog
===================================================================
--- xfmpc/trunk/ChangeLog 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/ChangeLog 2009-07-04 15:27:58 UTC (rev 7673)
@@ -1,3 +1,7 @@
+2009-07-04 Vincent Legout <vincent at legout.info>
+
+Switch to the new signal connect syntax
+
2009-07-03 Vincent Legout <vincent at legout.info>
Move has_filename () function to playlist.vala
Modified: xfmpc/trunk/src/dbbrowser.c
===================================================================
--- xfmpc/trunk/src/dbbrowser.c 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/dbbrowser.c 2009-07-04 15:27:58 UTC (rev 7673)
@@ -133,20 +133,20 @@
XfmpcDbbrowser* xfmpc_dbbrowser_new (void);
XfmpcPreferences* xfmpc_preferences_get (void);
const char* xfmpc_preferences_get_dbbrowser_last_path (XfmpcPreferences* self);
-static void _xfmpc_dbbrowser_add_selected_rows_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self);
-static void _xfmpc_dbbrowser_cb_replace_with_selected_rows_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self);
-static void _xfmpc_dbbrowser_cb_browse_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self);
+static void _xfmpc_dbbrowser_add_selected_rows_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void _xfmpc_dbbrowser_cb_replace_with_selected_rows_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void _xfmpc_dbbrowser_cb_browse_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
static void _xfmpc_dbbrowser_reload_xfmpc_mpdclient_connected (XfmpcMpdclient* _sender, gpointer self);
static void _xfmpc_dbbrowser_reload_xfmpc_mpdclient_database_changed (XfmpcMpdclient* _sender, gpointer self);
static void _xfmpc_dbbrowser_cb_playlist_changed_xfmpc_mpdclient_playlist_changed (XfmpcMpdclient* _sender, gpointer self);
static void _xfmpc_dbbrowser_cb_row_activated_gtk_tree_view_row_activated (GtkTreeView* _sender, const GtkTreePath* path, GtkTreeViewColumn* column, gpointer self);
-static gboolean _xfmpc_dbbrowser_cb_key_pressed_gtk_widget_key_press_event (GtkTreeView* _sender, const GdkEventKey* event, gpointer self);
-static gboolean _xfmpc_dbbrowser_cb_button_released_gtk_widget_button_press_event (GtkTreeView* _sender, const GdkEventButton* event, gpointer self);
-static gboolean _xfmpc_dbbrowser_cb_popup_menu_gtk_widget_popup_menu (GtkTreeView* _sender, gpointer self);
+static gboolean _xfmpc_dbbrowser_cb_key_pressed_gtk_widget_key_press_event (GtkWidget* _sender, const GdkEventKey* event, gpointer self);
+static gboolean _xfmpc_dbbrowser_cb_button_released_gtk_widget_button_press_event (GtkWidget* _sender, const GdkEventButton* event, gpointer self);
+static gboolean _xfmpc_dbbrowser_cb_popup_menu_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self);
static void _xfmpc_dbbrowser_cb_search_entry_activated_gtk_entry_activate (GtkEntry* _sender, gpointer self);
-static gboolean _xfmpc_dbbrowser_cb_search_entry_key_released_gtk_widget_key_release_event (GtkEntry* _sender, const GdkEventKey* event, gpointer self);
-static void _xfmpc_dbbrowser_cb_search_entry_changed_gtk_editable_changed (GtkEntry* _sender, gpointer self);
-static void _xfmpc_dbbrowser_reload_g_object_notify (XfmpcPreferences* _sender, GParamSpec* pspec, gpointer self);
+static gboolean _xfmpc_dbbrowser_cb_search_entry_key_released_gtk_widget_key_release_event (GtkWidget* _sender, const GdkEventKey* event, gpointer self);
+static void _xfmpc_dbbrowser_cb_search_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _xfmpc_dbbrowser_reload_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self);
static GObject * xfmpc_dbbrowser_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
static gpointer xfmpc_dbbrowser_parent_class = NULL;
static void xfmpc_dbbrowser_finalize (GObject* obj);
@@ -344,25 +344,30 @@
char* basename;
gboolean is_bold;
gint i;
+ XfmpcPlaylist* _tmp0_;
+ XfmpcPlaylist* playlist;
gboolean no_result_buf;
gboolean no_result;
GdkColor color = {0};
- gboolean _tmp0_;
+ gboolean _tmp1_;
g_return_if_fail (self != NULL);
g_return_if_fail (query != NULL);
filename = g_strdup ("");
basename = g_strdup ("");
is_bold = FALSE;
i = 0;
+ _tmp0_ = NULL;
+ playlist = (_tmp0_ = XFMPC_PLAYLIST (g_object_get_data ((GObject*) self, "XfmpcPlaylist")), (_tmp0_ == NULL) ? NULL : g_object_ref (_tmp0_));
if (!xfmpc_mpdclient_is_connected (self->priv->mpdclient)) {
filename = (g_free (filename), NULL);
basename = (g_free (basename), NULL);
+ (playlist == NULL) ? NULL : (playlist = (g_object_unref (playlist), NULL));
return;
}
self->priv->is_searching = TRUE;
xfmpc_dbbrowser_clear (self);
while (xfmpc_mpdclient_database_search (self->priv->mpdclient, query, &filename, &basename)) {
- is_bold = xfmpc_mpdclient_playlist_has_filename (self->priv->mpdclient, filename, FALSE);
+ is_bold = xfmpc_playlist_has_filename (playlist, filename, FALSE);
xfmpc_dbbrowser_append (self, filename, basename, FALSE, is_bold);
i++;
}
@@ -379,24 +384,24 @@
no_result = FALSE;
}
}
- _tmp0_ = FALSE;
+ _tmp1_ = FALSE;
if (no_result == no_result_buf) {
- _tmp0_ = no_result;
+ _tmp1_ = no_result;
} else {
- _tmp0_ = FALSE;
+ _tmp1_ = FALSE;
}
- if (_tmp0_) {
+ if (_tmp1_) {
gtk_widget_modify_bg ((GtkWidget*) self->priv->search_entry, GTK_STATE_NORMAL, &color);
gtk_widget_modify_bg ((GtkWidget*) self->priv->search_entry, GTK_STATE_SELECTED, &color);
} else {
- gboolean _tmp1_;
- _tmp1_ = FALSE;
+ gboolean _tmp2_;
+ _tmp2_ = FALSE;
if (no_result == no_result_buf) {
- _tmp1_ = !no_result;
+ _tmp2_ = !no_result;
} else {
- _tmp1_ = FALSE;
+ _tmp2_ = FALSE;
}
- if (_tmp1_) {
+ if (_tmp2_) {
gtk_widget_modify_bg ((GtkWidget*) self->priv->search_entry, GTK_STATE_NORMAL, NULL);
gtk_widget_modify_bg ((GtkWidget*) self->priv->search_entry, GTK_STATE_SELECTED, NULL);
}
@@ -412,6 +417,7 @@
}
filename = (g_free (filename), NULL);
basename = (g_free (basename), NULL);
+ (playlist == NULL) ? NULL : (playlist = (g_object_unref (playlist), NULL));
}
@@ -734,17 +740,17 @@
}
-static void _xfmpc_dbbrowser_add_selected_rows_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self) {
+static void _xfmpc_dbbrowser_add_selected_rows_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
xfmpc_dbbrowser_add_selected_rows (self);
}
-static void _xfmpc_dbbrowser_cb_replace_with_selected_rows_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self) {
+static void _xfmpc_dbbrowser_cb_replace_with_selected_rows_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
xfmpc_dbbrowser_cb_replace_with_selected_rows (self);
}
-static void _xfmpc_dbbrowser_cb_browse_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self) {
+static void _xfmpc_dbbrowser_cb_browse_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
xfmpc_dbbrowser_cb_browse (self);
}
@@ -769,17 +775,17 @@
}
-static gboolean _xfmpc_dbbrowser_cb_key_pressed_gtk_widget_key_press_event (GtkTreeView* _sender, const GdkEventKey* event, gpointer self) {
+static gboolean _xfmpc_dbbrowser_cb_key_pressed_gtk_widget_key_press_event (GtkWidget* _sender, const GdkEventKey* event, gpointer self) {
return xfmpc_dbbrowser_cb_key_pressed (self, event);
}
-static gboolean _xfmpc_dbbrowser_cb_button_released_gtk_widget_button_press_event (GtkTreeView* _sender, const GdkEventButton* event, gpointer self) {
+static gboolean _xfmpc_dbbrowser_cb_button_released_gtk_widget_button_press_event (GtkWidget* _sender, const GdkEventButton* event, gpointer self) {
return xfmpc_dbbrowser_cb_button_released (self, event);
}
-static gboolean _xfmpc_dbbrowser_cb_popup_menu_gtk_widget_popup_menu (GtkTreeView* _sender, gpointer self) {
+static gboolean _xfmpc_dbbrowser_cb_popup_menu_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self) {
return xfmpc_dbbrowser_cb_popup_menu (self);
}
@@ -789,17 +795,17 @@
}
-static gboolean _xfmpc_dbbrowser_cb_search_entry_key_released_gtk_widget_key_release_event (GtkEntry* _sender, const GdkEventKey* event, gpointer self) {
+static gboolean _xfmpc_dbbrowser_cb_search_entry_key_released_gtk_widget_key_release_event (GtkWidget* _sender, const GdkEventKey* event, gpointer self) {
return xfmpc_dbbrowser_cb_search_entry_key_released (self, event);
}
-static void _xfmpc_dbbrowser_cb_search_entry_changed_gtk_editable_changed (GtkEntry* _sender, gpointer self) {
+static void _xfmpc_dbbrowser_cb_search_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
xfmpc_dbbrowser_cb_search_entry_changed (self);
}
-static void _xfmpc_dbbrowser_reload_g_object_notify (XfmpcPreferences* _sender, GParamSpec* pspec, gpointer self) {
+static void _xfmpc_dbbrowser_reload_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) {
xfmpc_dbbrowser_reload (self);
}
Modified: xfmpc/trunk/src/dbbrowser.vala
===================================================================
--- xfmpc/trunk/src/dbbrowser.vala 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/dbbrowser.vala 2009-07-04 15:27:58 UTC (rev 7673)
@@ -94,17 +94,17 @@
var mi = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_ADD, null);
this.menu.append (mi);
- mi.activate += add_selected_rows;
+ mi.activate.connect (add_selected_rows);
mi = new Gtk.ImageMenuItem.with_mnemonic (_("Replace"));
var image = new Gtk.Image.from_stock (Gtk.STOCK_CUT, Gtk.IconSize.MENU);
mi.set_image (image);
this.menu.append (mi);
- mi.activate += cb_replace_with_selected_rows;
+ mi.activate.connect (cb_replace_with_selected_rows);
this.mi_browse = new Gtk.ImageMenuItem.with_mnemonic (_("Browse"));
image = new Gtk.Image.from_stock (Gtk.STOCK_OPEN, Gtk.IconSize.MENU);
this.mi_browse.set_image (image);
this.menu.append (this.mi_browse);
- this.mi_browse.activate += cb_browse;
+ this.mi_browse.activate.connect (cb_browse);
this.menu.show_all ();
@@ -115,21 +115,21 @@
pack_start (this.search_entry, false, false, 0);
/* Signals */
- this.mpdclient.connected += reload;
- this.mpdclient.database_changed += reload;
- this.mpdclient.playlist_changed += cb_playlist_changed;
+ this.mpdclient.connected.connect (reload);
+ this.mpdclient.database_changed.connect (reload);
+ this.mpdclient.playlist_changed.connect (cb_playlist_changed);
- this.treeview.row_activated += cb_row_activated;
- this.treeview.key_press_event += cb_key_pressed;
- this.treeview.button_press_event += cb_button_released;
- this.treeview.popup_menu += cb_popup_menu;
+ this.treeview.row_activated.connect (cb_row_activated);
+ this.treeview.key_press_event.connect (cb_key_pressed);
+ this.treeview.button_press_event.connect (cb_button_released);
+ this.treeview.popup_menu.connect (cb_popup_menu);
- this.search_entry.activate += cb_search_entry_activated;
- this.search_entry.key_release_event += cb_search_entry_key_released;
- this.search_entry.changed += cb_search_entry_changed;
+ this.search_entry.activate.connect (cb_search_entry_activated);
+ this.search_entry.key_release_event.connect (cb_search_entry_key_released);
+ this.search_entry.changed.connect (cb_search_entry_changed);
- this.preferences.notify["song-format"] += reload;
- this.preferences.notify["song-format-custom"] += reload;
+ this.preferences.notify["song-format"].connect (reload);
+ this.preferences.notify["song-format-custom"].connect (reload);
}
public void reload () {
Modified: xfmpc/trunk/src/extended-interface.c
===================================================================
--- xfmpc/trunk/src/extended-interface.c 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/extended-interface.c 2009-07-04 15:27:58 UTC (rev 7673)
@@ -134,15 +134,15 @@
static void xfmpc_extended_interface_popup_context_menu (XfmpcExtendedInterface* self);
static void xfmpc_extended_interface_menu_detach (XfmpcExtendedInterface* self, GtkWidget* attach_widget, GtkMenu* menu);
static void xfmpc_extended_interface_cb_context_menu_deactivate (XfmpcExtendedInterface* self);
-static void _xfmpc_extended_interface_cb_context_menu_deactivate_gtk_menu_shell_deactivate (GtkMenu* _sender, gpointer self);
+static void _xfmpc_extended_interface_cb_context_menu_deactivate_gtk_menu_shell_deactivate (GtkMenuShell* _sender, gpointer self);
static void xfmpc_extended_interface_cb_repeat_switch (XfmpcExtendedInterface* self);
-static void _xfmpc_extended_interface_cb_repeat_switch_gtk_menu_item_activate (GtkCheckMenuItem* _sender, gpointer self);
+static void _xfmpc_extended_interface_cb_repeat_switch_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
static void xfmpc_extended_interface_cb_random_switch (XfmpcExtendedInterface* self);
-static void _xfmpc_extended_interface_cb_random_switch_gtk_menu_item_activate (GtkCheckMenuItem* _sender, gpointer self);
+static void _xfmpc_extended_interface_cb_random_switch_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
static void xfmpc_extended_interface_cb_preferences (XfmpcExtendedInterface* self);
-static void _xfmpc_extended_interface_cb_preferences_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self);
+static void _xfmpc_extended_interface_cb_preferences_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
static void xfmpc_extended_interface_cb_about (XfmpcExtendedInterface* self);
-static void _xfmpc_extended_interface_cb_about_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self);
+static void _xfmpc_extended_interface_cb_about_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
static void xfmpc_extended_interface_cb_playlist_clear (XfmpcExtendedInterface* self);
static void xfmpc_extended_interface_cb_database_refresh (XfmpcExtendedInterface* self);
static void xfmpc_extended_interface_cb_interface_changed (XfmpcExtendedInterface* self);
@@ -247,27 +247,27 @@
}
-static void _xfmpc_extended_interface_cb_context_menu_deactivate_gtk_menu_shell_deactivate (GtkMenu* _sender, gpointer self) {
+static void _xfmpc_extended_interface_cb_context_menu_deactivate_gtk_menu_shell_deactivate (GtkMenuShell* _sender, gpointer self) {
xfmpc_extended_interface_cb_context_menu_deactivate (self);
}
-static void _xfmpc_extended_interface_cb_repeat_switch_gtk_menu_item_activate (GtkCheckMenuItem* _sender, gpointer self) {
+static void _xfmpc_extended_interface_cb_repeat_switch_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
xfmpc_extended_interface_cb_repeat_switch (self);
}
-static void _xfmpc_extended_interface_cb_random_switch_gtk_menu_item_activate (GtkCheckMenuItem* _sender, gpointer self) {
+static void _xfmpc_extended_interface_cb_random_switch_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
xfmpc_extended_interface_cb_random_switch (self);
}
-static void _xfmpc_extended_interface_cb_preferences_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self) {
+static void _xfmpc_extended_interface_cb_preferences_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
xfmpc_extended_interface_cb_preferences (self);
}
-static void _xfmpc_extended_interface_cb_about_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self) {
+static void _xfmpc_extended_interface_cb_about_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
xfmpc_extended_interface_cb_about (self);
}
@@ -387,34 +387,16 @@
static void xfmpc_extended_interface_cb_about (XfmpcExtendedInterface* self) {
char** _tmp1_;
- gint artists_size;
- gint artists_length1;
- char** _tmp0_;
- char** artists;
- char** _tmp3_;
gint authors_size;
gint authors_length1;
- char** _tmp2_;
+ char** _tmp0_;
char** authors;
- char** _tmp5_;
- gint documenters_size;
- gint documenters_length1;
- char** _tmp4_;
- char** documenters;
g_return_if_fail (self != NULL);
_tmp1_ = NULL;
_tmp0_ = NULL;
- artists = (_tmp1_ = (_tmp0_ = g_new0 (char*, 1 + 1), _tmp0_[0] = NULL, _tmp0_), artists_length1 = 1, artists_size = artists_length1, _tmp1_);
- _tmp3_ = NULL;
- _tmp2_ = NULL;
- authors = (_tmp3_ = (_tmp2_ = g_new0 (char*, 2 + 1), _tmp2_[0] = g_strdup ("Mike Massonnet <mmassonnet at xfce.org>"), _tmp2_[1] = g_strdup ("Vincent Legout <vincent at xfce.org>"), _tmp2_), authors_length1 = 2, authors_size = authors_length1, _tmp3_);
- _tmp5_ = NULL;
- _tmp4_ = NULL;
- documenters = (_tmp5_ = (_tmp4_ = g_new0 (char*, 1 + 1), _tmp4_[0] = NULL, _tmp4_), documenters_length1 = 1, documenters_size = documenters_length1, _tmp5_);
- gtk_show_about_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self))), "artists", artists, "authors", authors, "comments", _ ("MPD client written in GTK+ for Xfce"), "copyright", "Copyright \302\251 2008-2009 Mike Massonnet, Vincent Legout", "documenters", documenters, "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL), "translator-credits", _ ("translator-credits"), "version", PACKAGE_VERSION, "website", "http://goodies.xfce.org/projects/applications/xfmpc", NULL, NULL);
- artists = (_vala_array_free (artists, artists_length1, (GDestroyNotify) g_free), NULL);
+ authors = (_tmp1_ = (_tmp0_ = g_new0 (char*, 2 + 1), _tmp0_[0] = g_strdup ("Mike Massonnet <mmassonnet at xfce.org>"), _tmp0_[1] = g_strdup ("Vincent Legout <vincent at xfce.org>"), _tmp0_), authors_length1 = 2, authors_size = authors_length1, _tmp1_);
+ gtk_show_about_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self))), "artists", NULL, "authors", authors, "comments", _ ("MPD client written in GTK+ for Xfce"), "copyright", "Copyright \302\251 2008-2009 Mike Massonnet, Vincent Legout", "documenters", NULL, "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL), "translator-credits", _ ("translator-credits"), "version", PACKAGE_VERSION, "website", "http://goodies.xfce.org/projects/applications/xfmpc", NULL, NULL);
authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
- documenters = (_vala_array_free (documenters, documenters_length1, (GDestroyNotify) g_free), NULL);
}
Modified: xfmpc/trunk/src/extended-interface.vala
===================================================================
--- xfmpc/trunk/src/extended-interface.vala 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/extended-interface.vala 2009-07-04 15:27:58 UTC (rev 7673)
@@ -52,7 +52,7 @@
var button = new Gtk.Button ();
button.set_tooltip_text (_("Clear Playlist"));
- button.clicked += cb_playlist_clear;
+ button.clicked.connect (cb_playlist_clear);
hbox.pack_start (button, false, false, 0);
var image = new Gtk.Image.from_stock (Gtk.STOCK_NEW, Gtk.IconSize.MENU);
@@ -60,7 +60,7 @@
button = new Gtk.Button ();
button.set_tooltip_text (_("Refresh Database"));
- button.clicked += cb_database_refresh;
+ button.clicked.connect (cb_database_refresh);
hbox.pack_start (button, false, false, 0);
image = new Gtk.Image.from_stock (Gtk.STOCK_REFRESH, Gtk.IconSize.MENU);
@@ -68,8 +68,8 @@
this.context_button = new Xfce.ArrowButton (Gtk.ArrowType.DOWN);
((Widget) this.context_button).set_tooltip_text (_("Context Menu"));
- ((Button) this.context_button).pressed += popup_context_menu;
- ((Button) this.context_button).clicked += cb_context_menu_clicked;
+ ((Button) this.context_button).pressed.connect (popup_context_menu);
+ ((Button) this.context_button).clicked.connect (cb_context_menu_clicked);
hbox.pack_start (((Widget) this.context_button), false, false, 0);
this.list_store = new Gtk.ListStore (Columns.N_COLUMNS,
@@ -78,7 +78,7 @@
this.combobox = new Gtk.ComboBox.with_model (this.list_store);
hbox.pack_start (combobox, true, true, 0);
- this.combobox.changed += cb_interface_changed;
+ this.combobox.changed.connect (cb_interface_changed);
var cell = new Gtk.CellRendererText ();
this.combobox.pack_start (cell, true);
@@ -151,27 +151,27 @@
this.context_menu = new Gtk.Menu ();
this.context_menu.set_screen (attach_widget.get_screen ());
this.context_menu.attach_to_widget (attach_widget, (Gtk.MenuDetachFunc) menu_detach);
- this.context_menu.deactivate += cb_context_menu_deactivate;
+ this.context_menu.deactivate.connect (cb_context_menu_deactivate);
var mi = new Gtk.CheckMenuItem.with_label (_("Repeat"));
mi.set_active (this.mpdclient.get_repeat ());
- mi.activate += cb_repeat_switch;
+ mi.activate.connect (cb_repeat_switch);
this.context_menu.append (mi);
mi = new Gtk.CheckMenuItem.with_label (_("Random"));
mi.set_active (this.mpdclient.get_random ());
- mi.activate += cb_random_switch;
+ mi.activate.connect (cb_random_switch);
this.context_menu.append (mi);
var separator = new Gtk.SeparatorMenuItem ();
this.context_menu.append (separator);
var imi = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_PREFERENCES, null);
- imi.activate += cb_preferences;
+ imi.activate.connect (cb_preferences);
this.context_menu.append (imi);
imi = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_ABOUT, null);
- imi.activate += cb_about;
+ imi.activate.connect (cb_about);
this.context_menu.append (imi);
this.context_menu.show_all ();
@@ -231,17 +231,15 @@
}
private void cb_about () {
- string[] artists = { null };
string[] authors = {"Mike Massonnet <mmassonnet at xfce.org>",
"Vincent Legout <vincent at xfce.org>"};
- string[] documenters = { null };
Gtk.show_about_dialog (((Gtk.Window) ((Gtk.Widget) this).get_toplevel ()),
- "artists", artists,
+ "artists", null,
"authors", authors,
"comments", _("MPD client written in GTK+ for Xfce"),
"copyright", "Copyright \302\251 2008-2009 Mike Massonnet, Vincent Legout",
- "documenters", documenters,
+ "documenters", null,
"license", Xfce.get_license_text (Xfce.LicenseTextType.GPL),
"translator-credits", _("translator-credits"),
"version", Config.PACKAGE_VERSION,
Modified: xfmpc/trunk/src/interface.c
===================================================================
--- xfmpc/trunk/src/interface.c 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/interface.c 2009-07-04 15:27:58 UTC (rev 7673)
@@ -108,8 +108,8 @@
static void _xfmpc_interface_cb_mpdclient_previous_gtk_button_clicked (GtkButton* _sender, gpointer self);
static void _xfmpc_interface_pp_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
static void _xfmpc_interface_cb_mpdclient_next_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void _xfmpc_interface_volume_changed_gtk_scale_button_value_changed (GtkVolumeButton* _sender, double value, gpointer self);
-static gboolean _xfmpc_interface_cb_progress_box_release_event_gtk_widget_button_release_event (GtkEventBox* _sender, const GdkEventButton* event, gpointer self);
+static void _xfmpc_interface_volume_changed_gtk_scale_button_value_changed (GtkScaleButton* _sender, double value, gpointer self);
+static gboolean _xfmpc_interface_cb_progress_box_release_event_gtk_widget_button_release_event (GtkWidget* _sender, const GdkEventButton* event, gpointer self);
static void _xfmpc_interface_reconnect_xfmpc_mpdclient_connected (XfmpcMpdclient* _sender, gpointer self);
static void _xfmpc_interface_cb_song_changed_xfmpc_mpdclient_song_changed (XfmpcMpdclient* _sender, gpointer self);
static void _xfmpc_interface_cb_pp_changed_xfmpc_mpdclient_pp_changed (XfmpcMpdclient* _sender, gboolean is_playing, gpointer self);
@@ -363,12 +363,12 @@
}
-static void _xfmpc_interface_volume_changed_gtk_scale_button_value_changed (GtkVolumeButton* _sender, double value, gpointer self) {
+static void _xfmpc_interface_volume_changed_gtk_scale_button_value_changed (GtkScaleButton* _sender, double value, gpointer self) {
xfmpc_interface_volume_changed (self, value);
}
-static gboolean _xfmpc_interface_cb_progress_box_release_event_gtk_widget_button_release_event (GtkEventBox* _sender, const GdkEventButton* event, gpointer self) {
+static gboolean _xfmpc_interface_cb_progress_box_release_event_gtk_widget_button_release_event (GtkWidget* _sender, const GdkEventButton* event, gpointer self) {
return xfmpc_interface_cb_progress_box_release_event (self, event);
}
Modified: xfmpc/trunk/src/interface.vala
===================================================================
--- xfmpc/trunk/src/interface.vala 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/interface.vala 2009-07-04 15:27:58 UTC (rev 7673)
@@ -115,18 +115,18 @@
vbox.add (this.subtitle);
/* === Signals === */
- this.button_prev.clicked += cb_mpdclient_previous;
- this.button_pp.clicked += pp_clicked;
- this.button_next.clicked += cb_mpdclient_next;
- this.button_volume.value_changed += volume_changed;
- progress_box.button_release_event += cb_progress_box_release_event;
+ this.button_prev.clicked.connect (cb_mpdclient_previous);
+ this.button_pp.clicked.connect (pp_clicked);
+ this.button_next.clicked.connect (cb_mpdclient_next);
+ this.button_volume.value_changed.connect (volume_changed);
+ progress_box.button_release_event.connect (cb_progress_box_release_event);
- this.mpdclient.connected += reconnect;
- this.mpdclient.song_changed += cb_song_changed;
- this.mpdclient.pp_changed += cb_pp_changed;
- this.mpdclient.time_changed += cb_time_changed;
- this.mpdclient.volume_changed += cb_volume_changed;
- this.mpdclient.stopped += cb_stopped;
+ this.mpdclient.connected.connect (reconnect);
+ this.mpdclient.song_changed.connect (cb_song_changed);
+ this.mpdclient.pp_changed.connect (cb_pp_changed);
+ this.mpdclient.time_changed.connect (cb_time_changed);
+ this.mpdclient.volume_changed.connect (cb_volume_changed);
+ this.mpdclient.stopped.connect (cb_stopped);
/* === Timeout === */
Timeout.add (1000, refresh);
Modified: xfmpc/trunk/src/main-window.c
===================================================================
--- xfmpc/trunk/src/main-window.c 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/main-window.c 2009-07-04 15:27:58 UTC (rev 7673)
@@ -143,8 +143,8 @@
XfmpcMainWindow* xfmpc_main_window_construct (GType object_type);
XfmpcMainWindow* xfmpc_main_window_new (void);
XfmpcPreferences* xfmpc_preferences_get (void);
-static gboolean _xfmpc_main_window_cb_window_closed_gtk_widget_delete_event (XfmpcMainWindow* _sender, GdkEvent* event, gpointer self);
-static gboolean _xfmpc_main_window_cb_window_state_event_gtk_widget_window_state_event (XfmpcMainWindow* _sender, const GdkEventWindowState* event, gpointer self);
+static gboolean _xfmpc_main_window_cb_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEvent* event, gpointer self);
+static gboolean _xfmpc_main_window_cb_window_state_event_gtk_widget_window_state_event (GtkWidget* _sender, const GdkEventWindowState* event, gpointer self);
gint xfmpc_preferences_get_last_window_posx (XfmpcPreferences* self);
gint xfmpc_preferences_get_last_window_posy (XfmpcPreferences* self);
gint xfmpc_preferences_get_last_window_width (XfmpcPreferences* self);
@@ -156,7 +156,7 @@
XfmpcExtendedInterface* xfmpc_extended_interface_construct (GType object_type);
GType xfmpc_extended_interface_get_type (void);
static void _xfmpc_main_window_cb_playlist_changed_xfmpc_mpdclient_playlist_changed (XfmpcMpdclient* _sender, gpointer self);
-static void _xfmpc_main_window_cb_show_statusbar_changed_g_object_notify (XfmpcPreferences* _sender, GParamSpec* pspec, gpointer self);
+static void _xfmpc_main_window_cb_show_statusbar_changed_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self);
static GObject * xfmpc_main_window_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
static gpointer xfmpc_main_window_parent_class = NULL;
static void xfmpc_main_window_finalize (GObject* obj);
@@ -401,12 +401,12 @@
}
-static gboolean _xfmpc_main_window_cb_window_closed_gtk_widget_delete_event (XfmpcMainWindow* _sender, GdkEvent* event, gpointer self) {
+static gboolean _xfmpc_main_window_cb_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEvent* event, gpointer self) {
return xfmpc_main_window_cb_window_closed (self, event);
}
-static gboolean _xfmpc_main_window_cb_window_state_event_gtk_widget_window_state_event (XfmpcMainWindow* _sender, const GdkEventWindowState* event, gpointer self) {
+static gboolean _xfmpc_main_window_cb_window_state_event_gtk_widget_window_state_event (GtkWidget* _sender, const GdkEventWindowState* event, gpointer self) {
return xfmpc_main_window_cb_window_state_event (self, event);
}
@@ -416,7 +416,7 @@
}
-static void _xfmpc_main_window_cb_show_statusbar_changed_g_object_notify (XfmpcPreferences* _sender, GParamSpec* pspec, gpointer self) {
+static void _xfmpc_main_window_cb_show_statusbar_changed_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) {
xfmpc_main_window_cb_show_statusbar_changed (self, pspec);
}
Modified: xfmpc/trunk/src/main-window.vala
===================================================================
--- xfmpc/trunk/src/main-window.vala 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/main-window.vala 2009-07-04 15:27:58 UTC (rev 7673)
@@ -66,8 +66,8 @@
set_icon_name ("stock_volume");
set_title (Config.PACKAGE_NAME);
set_default_size (330, 330);
- this.delete_event += cb_window_closed;
- this.window_state_event += cb_window_state_event;
+ this.delete_event.connect (cb_window_closed);
+ this.window_state_event.connect (cb_window_state_event);
this.vbox = new Gtk.VBox (false, 0);
add (vbox);
@@ -114,8 +114,8 @@
((Gtk.ToggleAction )(this.action_group.get_action ("view-statusbar"))).set_active (this.preferences.show_statusbar);
/* === Signals === */
- this.mpdclient.playlist_changed += cb_playlist_changed;
- this.preferences.notify["show-statusbar"] += cb_show_statusbar_changed;
+ this.mpdclient.playlist_changed.connect (cb_playlist_changed);
+ this.preferences.notify["show-statusbar"].connect (cb_show_statusbar_changed);
}
private bool cb_window_state_event (Gdk.EventWindowState event) {
Modified: xfmpc/trunk/src/playlist.c
===================================================================
--- xfmpc/trunk/src/playlist.c 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/playlist.c 2009-07-04 15:27:58 UTC (rev 7673)
@@ -165,19 +165,19 @@
XfmpcPlaylist* xfmpc_playlist_new (void);
XfmpcPreferences* xfmpc_preferences_get (void);
gboolean xfmpc_preferences_get_playlist_autocenter (XfmpcPreferences* self);
-static void _xfmpc_playlist_delete_selection_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self);
-static void _xfmpc_playlist_cb_browse_selection_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self);
-static void _xfmpc_playlist_cb_info_selection_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self);
+static void _xfmpc_playlist_delete_selection_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void _xfmpc_playlist_cb_browse_selection_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void _xfmpc_playlist_cb_info_selection_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
static void _xfmpc_playlist_cb_song_changed_xfmpc_mpdclient_song_changed (XfmpcMpdclient* _sender, gpointer self);
static void _xfmpc_playlist_cb_playlist_changed_xfmpc_mpdclient_playlist_changed (XfmpcMpdclient* _sender, gpointer self);
static void _xfmpc_playlist_cb_row_activated_gtk_tree_view_row_activated (GtkTreeView* _sender, const GtkTreePath* path, GtkTreeViewColumn* column, gpointer self);
-static gboolean _xfmpc_playlist_cb_key_released_gtk_widget_key_release_event (GtkTreeView* _sender, const GdkEventKey* event, gpointer self);
-static gboolean _xfmpc_playlist_cb_button_released_gtk_widget_button_press_event (GtkTreeView* _sender, const GdkEventButton* event, gpointer self);
-static gboolean _xfmpc_playlist_cb_popup_menu_gtk_widget_popup_menu (GtkTreeView* _sender, gpointer self);
+static gboolean _xfmpc_playlist_cb_key_released_gtk_widget_key_release_event (GtkWidget* _sender, const GdkEventKey* event, gpointer self);
+static gboolean _xfmpc_playlist_cb_button_released_gtk_widget_button_press_event (GtkWidget* _sender, const GdkEventButton* event, gpointer self);
+static gboolean _xfmpc_playlist_cb_popup_menu_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self);
static void _xfmpc_playlist_cb_filter_entry_activated_gtk_entry_activate (GtkEntry* _sender, gpointer self);
-static gboolean _xfmpc_playlist_cb_filter_entry_key_released_gtk_widget_key_release_event (GtkEntry* _sender, const GdkEventKey* event, gpointer self);
-static void _xfmpc_playlist_cb_filter_entry_changed_gtk_editable_changed (GtkEntry* _sender, gpointer self);
-static void _xfmpc_playlist_cb_playlist_changed_g_object_notify (XfmpcPreferences* _sender, GParamSpec* pspec, gpointer self);
+static gboolean _xfmpc_playlist_cb_filter_entry_key_released_gtk_widget_key_release_event (GtkWidget* _sender, const GdkEventKey* event, gpointer self);
+static void _xfmpc_playlist_cb_filter_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _xfmpc_playlist_cb_playlist_changed_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self);
static GObject * xfmpc_playlist_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
static gpointer xfmpc_playlist_parent_class = NULL;
static void xfmpc_playlist_finalize (GObject* obj);
@@ -700,17 +700,17 @@
}
-static void _xfmpc_playlist_delete_selection_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self) {
+static void _xfmpc_playlist_delete_selection_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
xfmpc_playlist_delete_selection (self);
}
-static void _xfmpc_playlist_cb_browse_selection_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self) {
+static void _xfmpc_playlist_cb_browse_selection_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
xfmpc_playlist_cb_browse_selection (self);
}
-static void _xfmpc_playlist_cb_info_selection_gtk_menu_item_activate (GtkImageMenuItem* _sender, gpointer self) {
+static void _xfmpc_playlist_cb_info_selection_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
xfmpc_playlist_cb_info_selection (self);
}
@@ -730,17 +730,17 @@
}
-static gboolean _xfmpc_playlist_cb_key_released_gtk_widget_key_release_event (GtkTreeView* _sender, const GdkEventKey* event, gpointer self) {
+static gboolean _xfmpc_playlist_cb_key_released_gtk_widget_key_release_event (GtkWidget* _sender, const GdkEventKey* event, gpointer self) {
return xfmpc_playlist_cb_key_released (self, event);
}
-static gboolean _xfmpc_playlist_cb_button_released_gtk_widget_button_press_event (GtkTreeView* _sender, const GdkEventButton* event, gpointer self) {
+static gboolean _xfmpc_playlist_cb_button_released_gtk_widget_button_press_event (GtkWidget* _sender, const GdkEventButton* event, gpointer self) {
return xfmpc_playlist_cb_button_released (self, event);
}
-static gboolean _xfmpc_playlist_cb_popup_menu_gtk_widget_popup_menu (GtkTreeView* _sender, gpointer self) {
+static gboolean _xfmpc_playlist_cb_popup_menu_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self) {
return xfmpc_playlist_cb_popup_menu (self);
}
@@ -750,17 +750,17 @@
}
-static gboolean _xfmpc_playlist_cb_filter_entry_key_released_gtk_widget_key_release_event (GtkEntry* _sender, const GdkEventKey* event, gpointer self) {
+static gboolean _xfmpc_playlist_cb_filter_entry_key_released_gtk_widget_key_release_event (GtkWidget* _sender, const GdkEventKey* event, gpointer self) {
return xfmpc_playlist_cb_filter_entry_key_released (self, event);
}
-static void _xfmpc_playlist_cb_filter_entry_changed_gtk_editable_changed (GtkEntry* _sender, gpointer self) {
+static void _xfmpc_playlist_cb_filter_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
xfmpc_playlist_cb_filter_entry_changed (self);
}
-static void _xfmpc_playlist_cb_playlist_changed_g_object_notify (XfmpcPreferences* _sender, GParamSpec* pspec, gpointer self) {
+static void _xfmpc_playlist_cb_playlist_changed_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) {
xfmpc_playlist_cb_playlist_changed (self);
}
Modified: xfmpc/trunk/src/playlist.vala
===================================================================
--- xfmpc/trunk/src/playlist.vala 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/playlist.vala 2009-07-04 15:27:58 UTC (rev 7673)
@@ -102,15 +102,15 @@
var mi = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_REMOVE, null);
this.menu.append (mi);
- mi.activate += delete_selection;
+ mi.activate.connect (delete_selection);
this.mi_browse = new Gtk.ImageMenuItem.with_mnemonic (_("Browse"));
var image = new Gtk.Image.from_stock (Gtk.STOCK_OPEN, Gtk.IconSize.MENU);
this.mi_browse.set_image (image);
this.menu.append (this.mi_browse);
- this.mi_browse.activate += cb_browse_selection;
+ this.mi_browse.activate.connect (cb_browse_selection);
this.mi_information = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_INFO, null);
this.menu.append (mi_information);
- this.mi_information.activate += cb_info_selection;
+ this.mi_information.activate.connect (cb_info_selection);
this.menu.show_all ();
@@ -121,20 +121,20 @@
pack_start (this.filter_entry, false, false, 0);
/* Signals */
- this.mpdclient.song_changed += cb_song_changed;
- this.mpdclient.playlist_changed += cb_playlist_changed;
+ this.mpdclient.song_changed.connect (cb_song_changed);
+ this.mpdclient.playlist_changed.connect (cb_playlist_changed);
- this.treeview.row_activated += cb_row_activated;
- this.treeview.key_release_event += cb_key_released;
- this.treeview.button_press_event += cb_button_released;
- this.treeview.popup_menu += cb_popup_menu;
+ this.treeview.row_activated.connect (cb_row_activated);
+ this.treeview.key_release_event.connect (cb_key_released);
+ this.treeview.button_press_event.connect (cb_button_released);
+ this.treeview.popup_menu.connect (cb_popup_menu);
- this.filter_entry.activate += cb_filter_entry_activated;
- this.filter_entry.key_release_event += cb_filter_entry_key_released;
- this.filter_entry.changed += cb_filter_entry_changed;
+ this.filter_entry.activate.connect (cb_filter_entry_activated);
+ this.filter_entry.key_release_event.connect (cb_filter_entry_key_released);
+ this.filter_entry.changed.connect (cb_filter_entry_changed);
- this.preferences.notify["song-format"] += cb_playlist_changed;
- this.preferences.notify["song-format-custom"] += cb_playlist_changed;
+ this.preferences.notify["song-format"].connect (cb_playlist_changed);
+ this.preferences.notify["song-format-custom"].connect (cb_playlist_changed);
}
private static bool visible_func_filter_tree (Gtk.TreeModel model, out Gtk.TreeIter iter) {
Modified: xfmpc/trunk/src/preferences-dialog.c
===================================================================
--- xfmpc/trunk/src/preferences-dialog.c 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/preferences-dialog.c 2009-07-04 15:27:58 UTC (rev 7673)
@@ -91,39 +91,39 @@
enum {
XFMPC_PREFERENCES_DIALOG_DUMMY_PROPERTY
};
-static void xfmpc_preferences_dialog_cb_response (XfmpcPreferencesDialog* self, XfmpcPreferencesDialog* source, gint response);
-static void xfmpc_preferences_dialog_cb_use_defaults_toggled (XfmpcPreferencesDialog* self, GtkCheckButton* source);
+static void xfmpc_preferences_dialog_cb_response (XfmpcPreferencesDialog* self, gint response);
+static void xfmpc_preferences_dialog_cb_use_defaults_toggled (XfmpcPreferencesDialog* self);
void xfmpc_preferences_set_mpd_hostname (XfmpcPreferences* self, const char* value);
void xfmpc_preferences_set_mpd_port (XfmpcPreferences* self, gint value);
void xfmpc_preferences_set_mpd_password (XfmpcPreferences* self, const char* value);
void xfmpc_preferences_set_mpd_use_defaults (XfmpcPreferences* self, gboolean value);
static void xfmpc_preferences_dialog_cb_update_mpd (XfmpcPreferencesDialog* self, GtkButton* source);
void xfmpc_preferences_set_show_statusbar (XfmpcPreferences* self, gboolean value);
-static void xfmpc_preferences_dialog_cb_show_statusbar_toggled (XfmpcPreferencesDialog* self, GtkCheckButton* source);
+static void xfmpc_preferences_dialog_cb_show_statusbar_toggled (XfmpcPreferencesDialog* self);
GType xfmpc_preferences_song_format_get_type (void);
void xfmpc_preferences_set_song_format (XfmpcPreferences* self, XfmpcPreferencesSongFormat value);
static void xfmpc_preferences_dialog_cb_combo_format_changed (XfmpcPreferencesDialog* self, GtkComboBox* source);
static gboolean xfmpc_preferences_dialog_timeout_format (XfmpcPreferencesDialog* self);
static gboolean _xfmpc_preferences_dialog_timeout_format_gsource_func (gpointer self);
-static void xfmpc_preferences_dialog_cb_entry_custom_changed (XfmpcPreferencesDialog* self, GtkEntry* source);
+static void xfmpc_preferences_dialog_cb_entry_custom_changed (XfmpcPreferencesDialog* self);
void xfmpc_preferences_set_song_format_custom (XfmpcPreferences* self, const char* value);
XfmpcPreferencesDialog* xfmpc_preferences_dialog_new (void);
XfmpcPreferencesDialog* xfmpc_preferences_dialog_construct (GType object_type);
XfmpcPreferencesDialog* xfmpc_preferences_dialog_new (void);
XfmpcPreferences* xfmpc_preferences_get (void);
gboolean xfmpc_preferences_get_mpd_use_defaults (XfmpcPreferences* self);
-static void _xfmpc_preferences_dialog_cb_use_defaults_toggled_gtk_toggle_button_toggled (GtkCheckButton* _sender, gpointer self);
+static void _xfmpc_preferences_dialog_cb_use_defaults_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
const char* xfmpc_preferences_get_mpd_hostname (XfmpcPreferences* self);
gint xfmpc_preferences_get_mpd_port (XfmpcPreferences* self);
const char* xfmpc_preferences_get_mpd_password (XfmpcPreferences* self);
static void _xfmpc_preferences_dialog_cb_update_mpd_gtk_button_clicked (GtkButton* _sender, gpointer self);
gboolean xfmpc_preferences_get_show_statusbar (XfmpcPreferences* self);
-static void _xfmpc_preferences_dialog_cb_show_statusbar_toggled_gtk_toggle_button_toggled (GtkCheckButton* _sender, gpointer self);
+static void _xfmpc_preferences_dialog_cb_show_statusbar_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
XfmpcPreferencesSongFormat xfmpc_preferences_get_song_format (XfmpcPreferences* self);
const char* xfmpc_preferences_get_song_format_custom (XfmpcPreferences* self);
static void _xfmpc_preferences_dialog_cb_combo_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void _xfmpc_preferences_dialog_cb_entry_custom_changed_gtk_editable_changed (GtkEntry* _sender, gpointer self);
-static void _xfmpc_preferences_dialog_cb_response_gtk_dialog_response (XfmpcPreferencesDialog* _sender, gint response_id, gpointer self);
+static void _xfmpc_preferences_dialog_cb_entry_custom_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _xfmpc_preferences_dialog_cb_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
static GObject * xfmpc_preferences_dialog_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
static gpointer xfmpc_preferences_dialog_parent_class = NULL;
static void xfmpc_preferences_dialog_finalize (GObject* obj);
@@ -133,9 +133,8 @@
/*
* Signal callbacks
*/
-static void xfmpc_preferences_dialog_cb_response (XfmpcPreferencesDialog* self, XfmpcPreferencesDialog* source, gint response) {
+static void xfmpc_preferences_dialog_cb_response (XfmpcPreferencesDialog* self, gint response) {
g_return_if_fail (self != NULL);
- g_return_if_fail (source != NULL);
switch (response) {
case GTK_RESPONSE_CLOSE:
{
@@ -146,9 +145,8 @@
}
-static void xfmpc_preferences_dialog_cb_use_defaults_toggled (XfmpcPreferencesDialog* self, GtkCheckButton* source) {
+static void xfmpc_preferences_dialog_cb_use_defaults_toggled (XfmpcPreferencesDialog* self) {
g_return_if_fail (self != NULL);
- g_return_if_fail (source != NULL);
gtk_widget_set_sensitive ((GtkWidget*) self->priv->mpd_vbox, !gtk_toggle_button_get_active ((GtkToggleButton*) self->priv->entry_use_defaults));
}
@@ -167,9 +165,8 @@
}
-static void xfmpc_preferences_dialog_cb_show_statusbar_toggled (XfmpcPreferencesDialog* self, GtkCheckButton* source) {
+static void xfmpc_preferences_dialog_cb_show_statusbar_toggled (XfmpcPreferencesDialog* self) {
g_return_if_fail (self != NULL);
- g_return_if_fail (source != NULL);
xfmpc_preferences_set_show_statusbar (self->priv->preferences, gtk_toggle_button_get_active ((GtkToggleButton*) self->priv->show_statusbar));
}
@@ -228,9 +225,8 @@
}
-static void xfmpc_preferences_dialog_cb_entry_custom_changed (XfmpcPreferencesDialog* self, GtkEntry* source) {
+static void xfmpc_preferences_dialog_cb_entry_custom_changed (XfmpcPreferencesDialog* self) {
g_return_if_fail (self != NULL);
- g_return_if_fail (source != NULL);
if (self->priv->format_timeout > 0) {
g_source_remove (self->priv->format_timeout);
}
@@ -262,8 +258,8 @@
}
-static void _xfmpc_preferences_dialog_cb_use_defaults_toggled_gtk_toggle_button_toggled (GtkCheckButton* _sender, gpointer self) {
- xfmpc_preferences_dialog_cb_use_defaults_toggled (self, _sender);
+static void _xfmpc_preferences_dialog_cb_use_defaults_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+ xfmpc_preferences_dialog_cb_use_defaults_toggled (self);
}
@@ -272,8 +268,8 @@
}
-static void _xfmpc_preferences_dialog_cb_show_statusbar_toggled_gtk_toggle_button_toggled (GtkCheckButton* _sender, gpointer self) {
- xfmpc_preferences_dialog_cb_show_statusbar_toggled (self, _sender);
+static void _xfmpc_preferences_dialog_cb_show_statusbar_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+ xfmpc_preferences_dialog_cb_show_statusbar_toggled (self);
}
@@ -282,13 +278,13 @@
}
-static void _xfmpc_preferences_dialog_cb_entry_custom_changed_gtk_editable_changed (GtkEntry* _sender, gpointer self) {
- xfmpc_preferences_dialog_cb_entry_custom_changed (self, _sender);
+static void _xfmpc_preferences_dialog_cb_entry_custom_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+ xfmpc_preferences_dialog_cb_entry_custom_changed (self);
}
-static void _xfmpc_preferences_dialog_cb_response_gtk_dialog_response (XfmpcPreferencesDialog* _sender, gint response_id, gpointer self) {
- xfmpc_preferences_dialog_cb_response (self, _sender, response_id);
+static void _xfmpc_preferences_dialog_cb_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
+ xfmpc_preferences_dialog_cb_response (self, response_id);
}
Modified: xfmpc/trunk/src/preferences-dialog.vala
===================================================================
--- xfmpc/trunk/src/preferences-dialog.vala 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/preferences-dialog.vala 2009-07-04 15:27:58 UTC (rev 7673)
@@ -69,7 +69,7 @@
this.mpd_vbox = new Gtk.VBox (false, 6);
vbox2.pack_start (this.mpd_vbox, false, false, 0);
- this.entry_use_defaults.toggled += cb_use_defaults_toggled;
+ this.entry_use_defaults.toggled.connect (cb_use_defaults_toggled);
this.mpd_vbox.set_sensitive (!this.entry_use_defaults.get_active ());
var hbox = new Gtk.HBox (false, 2);
@@ -101,7 +101,7 @@
hbox.pack_start (this.entry_passwd, true, true, 0);
var button = new Gtk.Button.from_stock (Gtk.STOCK_APPLY);
- button.clicked += cb_update_mpd;
+ button.clicked.connect (cb_update_mpd);
vbox2.pack_start (button, true, true, 0);
/* Display */
@@ -116,7 +116,7 @@
this.show_statusbar = new Gtk.CheckButton.with_mnemonic (_("Show _stastusbar"));
this.show_statusbar.set_active (this.preferences.show_statusbar);
- this.show_statusbar.toggled += cb_show_statusbar_toggled;
+ this.show_statusbar.toggled.connect (cb_show_statusbar_toggled);
vbox2.pack_start (this.show_statusbar, false, false, 0);
vbox2 = new Gtk.VBox (false, 6);
@@ -155,8 +155,8 @@
this.entry_custom.set_sensitive (this.combo_format.get_active () == 6);
hbox.pack_start (this.entry_custom, true, true, 0);
- this.combo_format.changed += cb_combo_format_changed;
- this.entry_custom.changed += cb_entry_custom_changed;
+ this.combo_format.changed.connect (cb_combo_format_changed);
+ this.entry_custom.changed.connect (cb_entry_custom_changed);
vbox2.pack_start (hbox, true, true, 0);
@@ -211,14 +211,14 @@
show_all ();
/* Signals */
- this.response += cb_response;
+ this.response.connect (cb_response);
}
/*
* Signal callbacks
*/
- private void cb_response (PreferencesDialog source, int response) {
+ private void cb_response (int response) {
switch (response) {
case Gtk.ResponseType.CLOSE:
destroy ();
@@ -226,7 +226,7 @@
}
}
- private void cb_use_defaults_toggled (Gtk.CheckButton source) {
+ private void cb_use_defaults_toggled () {
this.mpd_vbox.set_sensitive (!this.entry_use_defaults.get_active ());
}
@@ -242,7 +242,7 @@
mpdclient.connect ();
}
- private void cb_show_statusbar_toggled (Gtk.CheckButton source) {
+ private void cb_show_statusbar_toggled () {
this.preferences.show_statusbar = this.show_statusbar.get_active ();
}
@@ -263,7 +263,7 @@
this.entry_custom.set_sensitive (this.combo_format.get_active () == 6);
}
- private void cb_entry_custom_changed (Gtk.Entry source) {
+ private void cb_entry_custom_changed () {
if (this.format_timeout > 0)
GLib.Source.remove (this.format_timeout);
Modified: xfmpc/trunk/src/song-dialog.c
===================================================================
--- xfmpc/trunk/src/song-dialog.c 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/song-dialog.c 2009-07-04 15:27:58 UTC (rev 7673)
@@ -58,8 +58,8 @@
enum {
XFMPC_SONG_DIALOG_DUMMY_PROPERTY
};
-static void xfmpc_song_dialog_cb_response (XfmpcSongDialog* self, XfmpcSongDialog* source, gint response);
-static void _xfmpc_song_dialog_cb_response_gtk_dialog_response (XfmpcSongDialog* _sender, gint response_id, gpointer self);
+static void xfmpc_song_dialog_cb_response (XfmpcSongDialog* self, gint response);
+static void _xfmpc_song_dialog_cb_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
XfmpcSongDialog* xfmpc_song_dialog_new (gint song_id);
XfmpcSongDialog* xfmpc_song_dialog_construct (GType object_type, gint song_id);
XfmpcSongDialog* xfmpc_song_dialog_new (gint song_id);
@@ -68,8 +68,8 @@
-static void _xfmpc_song_dialog_cb_response_gtk_dialog_response (XfmpcSongDialog* _sender, gint response_id, gpointer self) {
- xfmpc_song_dialog_cb_response (self, _sender, response_id);
+static void _xfmpc_song_dialog_cb_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
+ xfmpc_song_dialog_cb_response (self, response_id);
}
@@ -202,9 +202,8 @@
/*
* Signal callbacks
*/
-static void xfmpc_song_dialog_cb_response (XfmpcSongDialog* self, XfmpcSongDialog* source, gint response) {
+static void xfmpc_song_dialog_cb_response (XfmpcSongDialog* self, gint response) {
g_return_if_fail (self != NULL);
- g_return_if_fail (source != NULL);
switch (response) {
case GTK_RESPONSE_CLOSE:
{
Modified: xfmpc/trunk/src/song-dialog.vala
===================================================================
--- xfmpc/trunk/src/song-dialog.vala 2009-07-04 14:15:12 UTC (rev 7672)
+++ xfmpc/trunk/src/song-dialog.vala 2009-07-04 15:27:58 UTC (rev 7673)
@@ -105,14 +105,14 @@
show_all ();
/* Signals */
- this.response += cb_response;
+ this.response.connect (cb_response);
}
/*
* Signal callbacks
*/
- private void cb_response (SongDialog source, int response) {
+ private void cb_response (int response) {
switch (response) {
case Gtk.ResponseType.CLOSE:
destroy ();
More information about the Goodies-commits
mailing list