[Xfce4-commits] r22147 - xfce4-mixer/trunk/panel-plugin
Author: dannym Date: 2006-06-17 21:10:49 + (Sat, 17 Jun 2006) New Revision: 22147 Modified: xfce4-mixer/trunk/panel-plugin/plugin.c Log: eew... don't pass gpointer around Modified: xfce4-mixer/trunk/panel-plugin/plugin.c === --- xfce4-mixer/trunk/panel-plugin/plugin.c 2006-06-17 19:28:54 UTC (rev 22146) +++ xfce4-mixer/trunk/panel-plugin/plugin.c 2006-06-17 21:10:49 UTC (rev 22147) @@ -25,10 +25,9 @@ #define MIXER_RC_GROUP "mixer-plugin" /* Panel Plugin Interface */ - static void mixer_construct (XfcePanelPlugin *plugin); -static void mixer_write_config(XfcePanelPlugin* plugin, gpointer user_data); + XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(mixer_construct); @@ -46,6 +45,8 @@ guint timer; } t_mixer; +static void mixer_write_config(XfcePanelPlugin* plugin, t_mixer* mixer); + GtkTooltips* tooltips; /* used by slider tiny */ static XfceIconTheme* icontheme; @@ -117,7 +118,7 @@ xfce_mixer_prefbox_save_preferences (mixer->prefbox, mixer->prefs); -mixer_write_config(mixer->temp_plugin, user_data); +mixer_write_config(mixer->temp_plugin, mixer); gtk_container_remove (GTK_CONTAINER(dialog->vbox), GTK_WIDGET(mixer->prefbox)); @@ -192,10 +193,10 @@ static t_mixer * mixer_new(void); -static void mixer_read_config(XfcePanelPlugin* plugin, gpointer user_data); +static void mixer_read_config(XfcePanelPlugin* plugin, t_mixer *mixer); -static void mixer_write_config(XfcePanelPlugin* plugin, gpointer user_data); +static void mixer_write_config(XfcePanelPlugin* plugin, t_mixer *mixer); static void mixer_construct (XfcePanelPlugin *plugin) @@ -505,14 +506,11 @@ } static void -mixer_read_config(XfcePanelPlugin* plugin, gpointer user_data) +mixer_read_config(XfcePanelPlugin* plugin, t_mixer *mixer) { XfceRc* rc; gchar* path; - t_mixer *mixer; - mixer = (t_mixer *) user_data; - if (mixer->prefs == NULL) { return; } @@ -539,17 +537,13 @@ } static void -mixer_write_config(XfcePanelPlugin* plugin, gpointer user_data) +mixer_write_config(XfcePanelPlugin* plugin, t_mixer* mixer) { XfceRc* rc; gchar* path; - t_mixer *mixer; - DBG ("Save: %s", PLUGIN_NAME); - mixer = (t_mixer *) user_data; - if (mixer->prefs == NULL) { return; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22148 - in xfce4-mixer/trunk: . panel-plugin src
Author: dannym Date: 2006-06-17 21:31:34 + (Sat, 17 Jun 2006) New Revision: 22148 Modified: xfce4-mixer/trunk/TODO xfce4-mixer/trunk/panel-plugin/plugin.c xfce4-mixer/trunk/src/mixer-window.gob xfce4-mixer/trunk/src/xfce-mixer-window.c Log: switch to gtk icontheme (I can already feel the bugreports approaching :)) Modified: xfce4-mixer/trunk/TODO === --- xfce4-mixer/trunk/TODO 2006-06-17 21:10:49 UTC (rev 22147) +++ xfce4-mixer/trunk/TODO 2006-06-17 21:31:34 UTC (rev 22148) @@ -0,0 +1,3 @@ + +get rid of disclosure widget and use gtk expander + Modified: xfce4-mixer/trunk/panel-plugin/plugin.c === --- xfce4-mixer/trunk/panel-plugin/plugin.c 2006-06-17 21:10:49 UTC (rev 22147) +++ xfce4-mixer/trunk/panel-plugin/plugin.c 2006-06-17 21:31:34 UTC (rev 22148) @@ -48,7 +48,7 @@ static void mixer_write_config(XfcePanelPlugin* plugin, t_mixer* mixer); GtkTooltips* tooltips; /* used by slider tiny */ -static XfceIconTheme* icontheme; +static GtkIconTheme* icontheme; static void mixer_orientation_changed (XfcePanelPlugin *plugin, GtkOrientation orientation, @@ -206,7 +206,7 @@ register_vcs (); -icontheme = xfce_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (plugin))); +icontheme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (plugin))); tooltips = gtk_tooltips_new (); g_object_ref (G_OBJECT(tooltips)); gtk_object_sink (GTK_OBJECT(tooltips)); @@ -419,8 +419,7 @@ GdkPixbuf *pb; GdkPixbuf *pb2; - pb = xfce_icon_theme_load_category (icontheme, XFCE_ICON_CATEGORY_SOUND, 128); /* ??? */ - /* xfce_icon_theme_load_category */ + pb = xfce_themed_icon_load ("xfce-sound", 128); if (broken) { pb2 = gdk_pixbuf_copy(pb); Modified: xfce4-mixer/trunk/src/mixer-window.gob === --- xfce4-mixer/trunk/src/mixer-window.gob 2006-06-17 21:10:49 UTC (rev 22147) +++ xfce4-mixer/trunk/src/mixer-window.gob 2006-06-17 21:31:34 UTC (rev 22148) @@ -117,16 +117,16 @@ protected void set_my_icon(self) { GdkPixbuf *pb; - XfceIconTheme *it; + GtkIconTheme *it; GdkScreen *screen; screen = gtk_window_get_screen (GTK_WINDOW (self)); if (!screen) return; - it = xfce_icon_theme_get_for_screen (screen); - if (it) { - pb = xfce_icon_theme_load_category (it, XFCE_ICON_CATEGORY_SOUND, 48); - if (pb) { + it = gtk_icon_theme_get_for_screen (screen); + if (it != NULL) { + pb = xfce_themed_icon_load ("xfce-sound", 48); + if (pb != NULL) { gtk_window_set_icon (GTK_WINDOW (self), pb); g_object_unref (G_OBJECT (pb)); } Modified: xfce4-mixer/trunk/src/xfce-mixer-window.c === --- xfce4-mixer/trunk/src/xfce-mixer-window.c 2006-06-17 21:10:49 UTC (rev 22147) +++ xfce4-mixer/trunk/src/xfce-mixer-window.c 2006-06-17 21:31:34 UTC (rev 22148) @@ -443,16 +443,16 @@ #line 118 "mixer-window.gob" GdkPixbuf *pb; - XfceIconTheme *it; + GtkIconTheme *it; GdkScreen *screen; screen = gtk_window_get_screen (GTK_WINDOW (self)); if (!screen) return; - it = xfce_icon_theme_get_for_screen (screen); - if (it) { - pb = xfce_icon_theme_load_category (it, XFCE_ICON_CATEGORY_SOUND, 48); - if (pb) { + it = gtk_icon_theme_get_for_screen (screen); + if (it != NULL) { + pb = xfce_themed_icon_load ("xfce-sound", 48); + if (pb != NULL) { gtk_window_set_icon (GTK_WINDOW (self), pb); g_object_unref (G_OBJECT (pb)); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22482 - xfce4-mixer/trunk/lib
Author: dannym Date: 2006-07-19 19:48:07 + (Wed, 19 Jul 2006) New Revision: 22482 Modified: xfce4-mixer/trunk/lib/vc_oss.c Log: do not crash when RecSelect value is NULL Modified: xfce4-mixer/trunk/lib/vc_oss.c === --- xfce4-mixer/trunk/lib/vc_oss.c 2006-07-18 20:55:16 UTC (rev 22481) +++ xfce4-mixer/trunk/lib/vc_oss.c 2006-07-19 19:48:07 UTC (rev 22482) @@ -401,7 +401,12 @@ int xrecsrc; if (has_recselector && g_str_equal (which, NAME_RECSELECTOR)) { - i = find_control (v); + if (v == NULL) { + i = -1; + } else { + i = find_control (v); + } + if (i == -1) { g_warning ("oss: could not find control that the new recording source refers to. Not setting it."); return; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22964 - xfce4-mixer/trunk/panel-plugin
Author: dannym Date: 2006-08-31 18:06:32 + (Thu, 31 Aug 2006) New Revision: 22964 Modified: xfce4-mixer/trunk/panel-plugin/mixer-slider-tiny.gob xfce4-mixer/trunk/panel-plugin/xfce-mixer-slider-tiny.c Log: fix bug #1552 Modified: xfce4-mixer/trunk/panel-plugin/mixer-slider-tiny.gob === --- xfce4-mixer/trunk/panel-plugin/mixer-slider-tiny.gob2006-08-31 16:05:36 UTC (rev 22963) +++ xfce4-mixer/trunk/panel-plugin/mixer-slider-tiny.gob2006-08-31 18:06:32 UTC (rev 22964) @@ -58,7 +58,7 @@ gtk_container_add (GTK_CONTAINER (self->eb), GTK_WIDGET (self->progress)); - gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (self->eb), TRUE, TRUE, 5); + gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (self->eb), TRUE, TRUE, 0); g_signal_connect_swapped (self->eb, "scroll-event", G_CALLBACK(self_scroll_cb), self); g_signal_connect_swapped (self->eb, "button-press-event", G_CALLBACK(self_button_cb), self); Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-slider-tiny.c === --- xfce4-mixer/trunk/panel-plugin/xfce-mixer-slider-tiny.c 2006-08-31 16:05:36 UTC (rev 22963) +++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-slider-tiny.c 2006-08-31 18:06:32 UTC (rev 22964) @@ -169,7 +169,7 @@ gtk_container_add (GTK_CONTAINER (self->eb), GTK_WIDGET (self->progress)); - gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (self->eb), TRUE, TRUE, 5); + gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (self->eb), TRUE, TRUE, 0); g_signal_connect_swapped (self->eb, "scroll-event", G_CALLBACK(self_scroll_cb), self); g_signal_connect_swapped (self->eb, "button-press-event", G_CALLBACK(self_button_cb), self); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22965 - xfce4-mixer/trunk/panel-plugin
Author: dannym Date: 2006-08-31 18:16:13 + (Thu, 31 Aug 2006) New Revision: 22965 Modified: xfce4-mixer/trunk/panel-plugin/plugin.c Log: fix sizing some more Modified: xfce4-mixer/trunk/panel-plugin/plugin.c === --- xfce4-mixer/trunk/panel-plugin/plugin.c 2006-08-31 18:06:32 UTC (rev 22964) +++ xfce4-mixer/trunk/panel-plugin/plugin.c 2006-08-31 18:16:13 UTC (rev 22965) @@ -54,12 +54,21 @@ mixer_orientation_changed (XfcePanelPlugin *plugin, GtkOrientation orientation, t_mixer* mixer) { -if ((gtk_major_version == 2 && gtk_minor_version >= 6) || - gtk_major_version > 2) -{ -/*gdouble angle = (orientation == GTK_ORIENTATION_HORIZONTAL) ? 0 : 90;*/ -/* ??? g_object_set (G_OBJECT (label), "angle", angle, NULL); */ -} + int slider_width; + int size; + + g_warning ("mixer_orientation_changed"); + + size = xfce_panel_plugin_get_size (plugin); + slider_width = 8; /* + 2 * size;*/ + + if (orientation == GTK_ORIENTATION_VERTICAL) { + gtk_widget_set_size_request (GTK_WIDGET (plugin), -1, size); + gtk_widget_set_size_request (GTK_WIDGET(mixer->slider), slider_width, -1); + } else { + gtk_widget_set_size_request (GTK_WIDGET (plugin), size, -1); + gtk_widget_set_size_request(GTK_WIDGET(mixer->slider), -1, slider_width); + } } static void @@ -166,26 +175,15 @@ static void mixer_size_changed_cb (XfcePanelPlugin *plugin, int size, t_mixer* mixer) { - int slider_width; - DBG ("Set size to %d: %s", size, PLUGIN_NAME); -slider_width = 8; /* + 2 * size;*/ +/* weird... */ +mixer_orientation_changed (plugin, + xfce_panel_plugin_get_orientation (plugin), + mixer); -if (xfce_panel_plugin_get_orientation (plugin) == -GTK_ORIENTATION_HORIZONTAL) -{ -gtk_widget_set_size_request (GTK_WIDGET (plugin), -1, size); - gtk_widget_set_size_request(GTK_WIDGET(mixer->slider), slider_width, -1); -} -else -{ -gtk_widget_set_size_request (GTK_WIDGET (plugin), size, -1); - gtk_widget_set_size_request(GTK_WIDGET(mixer->slider), -1, slider_width); -} - - -gtk_widget_queue_resize (GTK_WIDGET (mixer->slider)); + +/*gtk_widget_queue_resize (GTK_WIDGET (mixer->slider));*/ } /* create widgets and connect to signals */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22966 - xfce4-mixer/trunk/panel-plugin
Author: dannym Date: 2006-08-31 18:25:18 + (Thu, 31 Aug 2006) New Revision: 22966 Modified: xfce4-mixer/trunk/panel-plugin/plugin.c Log: fix sizing some more Modified: xfce4-mixer/trunk/panel-plugin/plugin.c === --- xfce4-mixer/trunk/panel-plugin/plugin.c 2006-08-31 18:16:13 UTC (rev 22965) +++ xfce4-mixer/trunk/panel-plugin/plugin.c 2006-08-31 18:25:18 UTC (rev 22966) @@ -63,11 +63,13 @@ slider_width = 8; /* + 2 * size;*/ if (orientation == GTK_ORIENTATION_VERTICAL) { - gtk_widget_set_size_request (GTK_WIDGET (plugin), -1, size); + gtk_widget_set_size_request (GTK_WIDGET(plugin), size, size); + gtk_widget_set_size_request (GTK_WIDGET(mixer->ib), -1, -1); gtk_widget_set_size_request (GTK_WIDGET(mixer->slider), slider_width, -1); } else { - gtk_widget_set_size_request (GTK_WIDGET (plugin), size, -1); - gtk_widget_set_size_request(GTK_WIDGET(mixer->slider), -1, slider_width); + gtk_widget_set_size_request (GTK_WIDGET(plugin), -1, size); + gtk_widget_set_size_request (GTK_WIDGET(mixer->ib), size, -1); + gtk_widget_set_size_request (GTK_WIDGET(mixer->slider), slider_width, -1); } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22967 - xfce4-mixer/trunk/panel-plugin
Author: dannym Date: 2006-08-31 18:26:58 + (Thu, 31 Aug 2006) New Revision: 22967 Modified: xfce4-mixer/trunk/panel-plugin/plugin.c Log: debugging message Modified: xfce4-mixer/trunk/panel-plugin/plugin.c === --- xfce4-mixer/trunk/panel-plugin/plugin.c 2006-08-31 18:25:18 UTC (rev 22966) +++ xfce4-mixer/trunk/panel-plugin/plugin.c 2006-08-31 18:26:58 UTC (rev 22967) @@ -57,7 +57,7 @@ int slider_width; int size; - g_warning ("mixer_orientation_changed"); + DBG ("mixer_orientation_changed"); size = xfce_panel_plugin_get_size (plugin); slider_width = 8; /* + 2 * size;*/ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22968 - xfce4-mixer/trunk/lib
Author: dannym Date: 2006-08-31 18:46:44 + (Thu, 31 Aug 2006) New Revision: 22968 Modified: xfce4-mixer/trunk/lib/vc_alsa.c Log: try to support capture controls (alsa weird :)) Modified: xfce4-mixer/trunk/lib/vc_alsa.c === --- xfce4-mixer/trunk/lib/vc_alsa.c 2006-08-31 18:26:58 UTC (rev 22967) +++ xfce4-mixer/trunk/lib/vc_alsa.c 2006-08-31 18:46:44 UTC (rev 22968) @@ -268,86 +268,142 @@ static int vc_get_volume(char const *which) { - long pmin,pmax; - long lval; - int pb; + int playback_enable; + int capture_enable; + long playback_min; + long playback_max; + long capture_min; + long capture_max; + long playback_value; + long capture_value; + snd_mixer_selem_channel_id_t chn; - snd_mixer_elem_t *xelem = NULL; + snd_mixer_elem_t *xelem; - if (!handle) return 0; + if (handle == NULL) { + return 0; + } - if (which) { + if (which != NULL) { xelem = find_control (which); } else { xelem = elem; } - if (!xelem) return 0; + if (xelem == NULL) { + return 0; + } - snd_mixer_selem_get_playback_volume_range(xelem, &pmin, &pmax); - pmin = 0; + snd_mixer_selem_get_playback_volume_range (xelem, &playback_min, &playback_max); + snd_mixer_selem_get_capture_volume_range (xelem, &capture_min, &capture_max); + playback_min = 0; + capture_min = 0; + /* if (snd_mixer_selem_has_playback_volume(xelem)) { */ for (chn = 0; chn <= SND_MIXER_SCHN_LAST; chn++) { - if (!snd_mixer_selem_has_playback_channel(xelem, chn)) continue; - - snd_mixer_selem_get_playback_volume(xelem, chn, &lval); + if (!snd_mixer_selem_has_playback_channel(xelem, chn)) { + continue; + } - pb = TRUE; - snd_mixer_selem_get_playback_switch (xelem, chn, &pb); - if (!pb) { + snd_mixer_selem_get_playback_volume(xelem, chn, &playback_value); + + playback_enable = TRUE; + snd_mixer_selem_get_playback_switch (xelem, chn, &playback_enable); + if (playback_enable == 0) { return 0; } /*error("%ld,%ld,%ld,%ld", pmin,pmax,lval,(lval - pmin) * 100 / (pmax-pmin));*/ - if (pmax > pmin) { - return (lval - pmin) * 100 / (pmax-pmin); + if (playback_max > playback_min) { + return (playback_value - playback_min) * 100 / (playback_max - playback_min); } else { - return lval; + return playback_value; } } + + /* if this point is reached, only capture setting remain, so use those */ + for (chn = 0; chn <= SND_MIXER_SCHN_LAST; chn++) { + if (!snd_mixer_selem_has_capture_channel(xelem, chn)) { + continue; + } + + snd_mixer_selem_get_capture_volume(xelem, chn, &capture_value); + + capture_enable = TRUE; + snd_mixer_selem_get_capture_switch (xelem, chn, &capture_enable); + if (capture_enable == 0) { + return 0; + } + + /*error("%ld,%ld,%ld,%ld", pmin,pmax,lval,(lval - pmin) * 100 / (pmax-pmin));*/ + if (capture_max > capture_min) { + return (capture_value - capture_min) * 100 / (capture_max - capture_min); + } else { + return capture_value; + } + } + return 0; } static void vc_set_volume(char const *which, int vol_p) { - long pmin,pmax; - long lval; - snd_mixer_selem_channel_id_t chn; - snd_mixer_elem_t *xelem = NULL; - double vold; + long playback_min; + long playback_max; + long capture_min; + long capture_max; + long playback_value; + long capture_value; + double playback_value_double; + double capture_value_double; + + /*snd_mixer_selem_channel_id_t chn;*/ + snd_mixer_elem_t *xelem; - if (!handle) return; - - if (which) { + if (handle == NULL) { + return; + } + + if (which != NULL) { xelem = find_control (which); } else { xelem = elem; } - if (!xelem) return; + if (xelem == NULL) { + return; + } - snd_mixer_selem_get_playback_volume_range(xelem, &pmin, &pmax); - pmin = 0; + snd_mixer_selem_get_playback_volume_range (xelem, &playback_min, &playback_max); + snd_mixer_selem_get_capture_volume_range (xelem
[Xfce4-commits] r23090 - xfce4-mixer/trunk/settings
Author: dannym Date: 2006-09-05 18:29:34 + (Tue, 05 Sep 2006) New Revision: 23090 Modified: xfce4-mixer/trunk/settings/sound.c Log: consistency Modified: xfce4-mixer/trunk/settings/sound.c === --- xfce4-mixer/trunk/settings/sound.c 2006-09-05 14:36:58 UTC (rev 23089) +++ xfce4-mixer/trunk/settings/sound.c 2006-09-05 18:29:34 UTC (rev 23090) @@ -81,12 +81,14 @@ plugin->caption = g_strdup (Q_ ("Button Label|Sound")); plugin->run_dialog = run_dialog; plugin->icon = xfce_themed_icon_load ("xfce-sound", 48); - if (G_LIKELY (plugin->icon != NULL)) -g_object_set_data_full (G_OBJECT (plugin->icon), "mcs-plugin-icon-name", g_strdup ("xfce4-mixer"), g_free); + + if (G_LIKELY (plugin->icon != NULL)) { + g_object_set_data_full (G_OBJECT (plugin->icon), "mcs-plugin-icon-name", g_strdup ("xfce-sound"), g_free); + } register_vcs (); -save_settings (plugin); + save_settings (plugin); return MCS_PLUGIN_INIT_OK; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23215 - pyxfce/trunk
Author: dannym Date: 2006-09-26 22:30:49 + (Tue, 26 Sep 2006) New Revision: 23215 Removed: pyxfce/trunk/aclocal.m4 Log: remove generated file Deleted: pyxfce/trunk/aclocal.m4 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23216 - pyxfce/trunk
Author: dannym Date: 2006-09-26 22:31:01 + (Tue, 26 Sep 2006) New Revision: 23216 Modified: pyxfce/trunk/Makefile.am Log: add panel to dist Modified: pyxfce/trunk/Makefile.am === --- pyxfce/trunk/Makefile.am2006-09-26 22:30:49 UTC (rev 23215) +++ pyxfce/trunk/Makefile.am2006-09-26 22:31:01 UTC (rev 23216) @@ -14,7 +14,7 @@ endif SUBDIRS = gui mcs netk util $(SUBDIR_MIGHTY_MOUSE) -DIST_SUBDIRS = gui mcs netk util +DIST_SUBDIRS = gui mcs netk util $(SUBDIR_MIGHTY_MOUSE) PLATFORM_VERSION = 4.2 PLATFORM_WIN32 = ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29073 - pyxfce/trunk/examples/systemtray
Author: dannym Date: 2008-12-31 12:52:40 + (Wed, 31 Dec 2008) New Revision: 29073 Modified: pyxfce/trunk/examples/systemtray/testtrayarea.py Log: add 'import' to Python system tray area test. Modified: pyxfce/trunk/examples/systemtray/testtrayarea.py === --- pyxfce/trunk/examples/systemtray/testtrayarea.py2008-12-31 10:03:51 UTC (rev 29072) +++ pyxfce/trunk/examples/systemtray/testtrayarea.py2008-12-31 12:52:40 UTC (rev 29073) @@ -5,6 +5,7 @@ import gtk import xfce4 +import xfce4.gui import sys w = gtk.Window() ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29144 - pyxfce/branches
Author: dannym Date: 2009-01-11 12:15:26 + (Sun, 11 Jan 2009) New Revision: 29144 Added: pyxfce/branches/4.4/ Log: branch 4.4. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29146 - in pyxfce/trunk: . menu
Author: dannym Date: 2009-01-11 13:31:09 + (Sun, 11 Jan 2009) New Revision: 29146 Added: pyxfce/trunk/menu/ pyxfce/trunk/menu/gen Log: add 'libxfce4menu' wrappers (unfinished). Added: pyxfce/trunk/menu/gen === --- pyxfce/trunk/menu/gen (rev 0) +++ pyxfce/trunk/menu/gen 2009-01-11 13:31:09 UTC (rev 29146) @@ -0,0 +1,43 @@ +#!/bin/sh + +inc="`pkg-config --variable=includedir libxfce4menu-1.0`"/xfce4 + +if [ -z "${inc}" ] +then + inc="`pkg-config --variable=includedir libxfcegui4-1.0`"/xfce4 +fi + +for s in "${inc}"/libxfce4menu/*.h +do + if [ "${s%-private.h}" != "${s}" ] + then + continue + fi + t="${s##*/}" + + t="${t%.h}" + + if [ "${t#netk-}" = "$t" ] + then + defs="${t/-/_}.defs" + # doesn't work: python -m codegen.h2def "$s" >"${defs}" + python /usr/lib/python2.5/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}" + fi +done + +#rm -f util.defs +#mmv -o 'xfce-*.defs' '#1.defs' +#rm -f libxfce4util.defs +#rm -f libxfce4util-config.defs +#rm -f generics.defs +#rm -f debug.defs +#cat menu.defs | grep -v '(gtype-id "MCS_TYPE_ACTION")' >menu.defs.new && mv mcs_client.defs.new mcs_client.defs + +#cat mcs_common.defs | egrep -v '\(gtype-id "(MCS_TYPE_RESULT|MCS_TYPE_TYPE|MCS_TYPE_MANAGER_CHECK)"\)' >mcs_common.defs.new && mv mcs_common.defs.new mcs_common.defs + +# (release-func mcs_manager_destroy)) + +#sed -e 's;(define-object McsClient;(define-object Client;' xfce_mcs-client.defs > xfce_mcs-client.defs.new && mv xfce_mcs-client.defs.new xfce_mcs-client.defs +#sed -e 's;(define-object McsChannel;(define-object Channel;' xfce_mcs-channel.defs > xfce_mcs-channel.defs.new && mv xfce_mcs-channel.defs.new xfce_mcs-channel.defs +#sed -e 's;(define-object McsManager;(define-object Manager;' xfce_mcs-manager.defs > xfce_mcs-manager.defs.new && mv xfce_mcs-manager.defs.new xfce_mcs-manager.defs + Property changes on: pyxfce/trunk/menu/gen ___ Added: svn:executable + * ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29147 - pyxfce/trunk
Author: dannym Date: 2009-01-11 13:32:03 + (Sun, 11 Jan 2009) New Revision: 29147 Removed: pyxfce/trunk/mcs/ Modified: pyxfce/trunk/__init__.py Log: remove 'libxfce4mcs' wrappers from trunk (gone from Xfce libs). Modified: pyxfce/trunk/__init__.py === --- pyxfce/trunk/__init__.py2009-01-11 13:31:09 UTC (rev 29146) +++ pyxfce/trunk/__init__.py2009-01-11 13:32:03 UTC (rev 29147) @@ -1,10 +1,10 @@ -__all__ = [ "gui", "mcs", "netk", "panel", "util" ] +__all__ = [ "gui", "menu", "netk", "panel", "util" ] #import util #import gui #import netk -#import mcs +#import menu #import exceptions # #try: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29148 - pyxfce/trunk/netk
Author: dannym Date: 2009-01-11 13:36:44 + (Sun, 11 Jan 2009) New Revision: 29148 Modified: pyxfce/trunk/netk/class_group.defs pyxfce/trunk/netk/enum_types.defs pyxfce/trunk/netk/util.defs pyxfce/trunk/netk/window_menu.defs pyxfce/trunk/netk/workspace.defs Log: mini-changes in comments. Modified: pyxfce/trunk/netk/class_group.defs === --- pyxfce/trunk/netk/class_group.defs 2009-01-11 13:32:03 UTC (rev 29147) +++ pyxfce/trunk/netk/class_group.defs 2009-01-11 13:36:44 UTC (rev 29148) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-class-group.h +;; From netk-class-group.h (define-function class_group_get_type (c-name "netk_class_group_get_type") Modified: pyxfce/trunk/netk/enum_types.defs === --- pyxfce/trunk/netk/enum_types.defs 2009-01-11 13:32:03 UTC (rev 29147) +++ pyxfce/trunk/netk/enum_types.defs 2009-01-11 13:36:44 UTC (rev 29148) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-enum-types.h +;; From netk-enum-types.h (define-function window_state_get_type (c-name "netk_window_state_get_type") Modified: pyxfce/trunk/netk/util.defs === --- pyxfce/trunk/netk/util.defs 2009-01-11 13:32:03 UTC (rev 29147) +++ pyxfce/trunk/netk/util.defs 2009-01-11 13:36:44 UTC (rev 29148) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-util.h +;; From netk-util.h (define-function gtk_window_set_type (c-name "netk_gtk_window_set_type") Modified: pyxfce/trunk/netk/window_menu.defs === --- pyxfce/trunk/netk/window_menu.defs 2009-01-11 13:32:03 UTC (rev 29147) +++ pyxfce/trunk/netk/window_menu.defs 2009-01-11 13:36:44 UTC (rev 29148) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-window-menu.h +;; From netk-window-menu.h (define-function create_window_menu (c-name "netk_create_window_menu") Modified: pyxfce/trunk/netk/workspace.defs === --- pyxfce/trunk/netk/workspace.defs2009-01-11 13:32:03 UTC (rev 29147) +++ pyxfce/trunk/netk/workspace.defs2009-01-11 13:36:44 UTC (rev 29148) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-workspace.h +;; From netk-workspace.h (define-function workspace_get_type (c-name "netk_workspace_get_type") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29149 - pyxfce/trunk/netk
Author: dannym Date: 2009-01-11 13:38:47 + (Sun, 11 Jan 2009) New Revision: 29149 Modified: pyxfce/trunk/netk/application.defs pyxfce/trunk/netk/window_action_menu.defs Log: mini-changes in comments. Modified: pyxfce/trunk/netk/application.defs === --- pyxfce/trunk/netk/application.defs 2009-01-11 13:36:44 UTC (rev 29148) +++ pyxfce/trunk/netk/application.defs 2009-01-11 13:38:47 UTC (rev 29149) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-application.h +;; From netk-application.h (define-function application_get_type (c-name "netk_application_get_type") Modified: pyxfce/trunk/netk/window_action_menu.defs === --- pyxfce/trunk/netk/window_action_menu.defs 2009-01-11 13:36:44 UTC (rev 29148) +++ pyxfce/trunk/netk/window_action_menu.defs 2009-01-11 13:38:47 UTC (rev 29149) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-window-action-menu.h +;; From netk-window-action-menu.h (define-function create_window_action_menu (c-name "netk_create_window_action_menu") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29150 - pyxfce/trunk/gui
Author: dannym Date: 2009-01-11 13:43:07 + (Sun, 11 Jan 2009) New Revision: 29150 Modified: pyxfce/trunk/gui/aboutdialog.defs pyxfce/trunk/gui/colorbutton.defs pyxfce/trunk/gui/decorbutton.defs pyxfce/trunk/gui/decortoggle.defs pyxfce/trunk/gui/dialogs.defs pyxfce/trunk/gui/filechooser.defs pyxfce/trunk/gui/framebox.defs pyxfce/trunk/gui/gdk_extensions.defs pyxfce/trunk/gui/gtk_extensions.defs pyxfce/trunk/gui/gtk_style.defs pyxfce/trunk/gui/gtktoxevent.defs pyxfce/trunk/gui/iconbutton.defs pyxfce/trunk/gui/icontheme.defs pyxfce/trunk/gui/libxfcegui4.defs pyxfce/trunk/gui/libxfcegui4_config.defs pyxfce/trunk/gui/menubutton.defs pyxfce/trunk/gui/movehandler.defs pyxfce/trunk/gui/scaled_image.defs pyxfce/trunk/gui/systemtray.defs pyxfce/trunk/gui/titled_dialog.defs pyxfce/trunk/gui/togglebutton.defs Log: mini-changes in comments. Modified: pyxfce/trunk/gui/aboutdialog.defs === --- pyxfce/trunk/gui/aboutdialog.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/aboutdialog.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_aboutdialog.h +;; From xfce_aboutdialog.h (define-function about_info_get_type (c-name "xfce_about_info_get_type") Modified: pyxfce/trunk/gui/colorbutton.defs === --- pyxfce/trunk/gui/colorbutton.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/colorbutton.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-colorbutton.h +;; From xfce-colorbutton.h (define-function color_button_new (c-name "xfce_color_button_new") Modified: pyxfce/trunk/gui/decorbutton.defs === --- pyxfce/trunk/gui/decorbutton.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/decorbutton.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -20,7 +20,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/xfce_decorbutton.h +;; From xfce_decorbutton.h (define-function decorbutton_get_type (c-name "xfce_decorbutton_get_type") Modified: pyxfce/trunk/gui/decortoggle.defs === --- pyxfce/trunk/gui/decortoggle.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/decortoggle.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_decortoggle.h +;; From xfce_decortoggle.h (define-function decortoggle_get_type (c-name "xfce_decortoggle_get_type") Modified: pyxfce/trunk/gui/dialogs.defs === --- pyxfce/trunk/gui/dialogs.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/dialogs.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/dialogs.h +;; From dialogs.h (define-function show_info (c-name "show_info") Modified: pyxfce/trunk/gui/filechooser.defs === --- pyxfce/trunk/gui/filechooser.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/filechooser.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -15,7 +15,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/xfce-filechooser.h +;; From xfce-filechooser.h (define-function file_chooser_new (c-name "xfce_file_chooser_new") Modified: pyxfce/trunk/gui/framebox.defs === --- pyxfce/trunk/gui/framebox.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/framebox.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_framebox.h +;; From xfce_framebox.h (define-function framebox_get_type (c-name "xfce_framebox_get_type") Modified: pyxfce/trunk/gui/gdk_extensions.defs === --- pyxfce/trunk/gui/gdk_extensions.defs2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/gdk_extensions.defs2009-01-11 13:43:07 UTC (rev 29150) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-gdk-extensions.h +;; From xfce-gdk-extensions.h (define-function gdk_display_get_fullname (c-name "xfce_gdk_display_get_fullname") Modified: pyxfce/trunk/gui/gtk_extensions.defs === --- pyxfce/trunk/gui/gtk_extensions.defs2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/gtk_extensions.defs2009-01-11 13:4
[Xfce4-commits] r29151 - pyxfce/trunk/util
Author: dannym Date: 2009-01-11 13:44:31 + (Sun, 11 Jan 2009) New Revision: 29151 Modified: pyxfce/trunk/util/desktopentry.defs pyxfce/trunk/util/fileutils.defs pyxfce/trunk/util/i18n.defs pyxfce/trunk/util/kiosk.defs pyxfce/trunk/util/miscutils.defs pyxfce/trunk/util/rc.defs pyxfce/trunk/util/resource.defs pyxfce/trunk/util/utf8.defs Log: mini-changes in comments (nothing else). Modified: pyxfce/trunk/util/desktopentry.defs === --- pyxfce/trunk/util/desktopentry.defs 2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/desktopentry.defs 2009-01-11 13:44:31 UTC (rev 29151) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-desktopentry.h +;; From xfce-desktopentry.h (define-function desktop_entry_get_type (c-name "xfce_desktop_entry_get_type") Modified: pyxfce/trunk/util/fileutils.defs === --- pyxfce/trunk/util/fileutils.defs2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/fileutils.defs2009-01-11 13:44:31 UTC (rev 29151) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-fileutils.h +;; From xfce-fileutils.h (define-function mkdirhier (c-name "xfce_mkdirhier") Modified: pyxfce/trunk/util/i18n.defs === --- pyxfce/trunk/util/i18n.defs 2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/i18n.defs 2009-01-11 13:44:31 UTC (rev 29151) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-i18n.h +;; From xfce-i18n.h (define-function textdomain (c-name "xfce_textdomain") Modified: pyxfce/trunk/util/kiosk.defs === --- pyxfce/trunk/util/kiosk.defs2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/kiosk.defs2009-01-11 13:44:31 UTC (rev 29151) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-kiosk.h +;; From xfce-kiosk.h (define-function kiosk_new (c-name "xfce_kiosk_new") Modified: pyxfce/trunk/util/miscutils.defs === --- pyxfce/trunk/util/miscutils.defs2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/miscutils.defs2009-01-11 13:44:31 UTC (rev 29151) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-miscutils.h +;; From xfce-miscutils.h (define-function version_string (c-name "xfce_version_string") Modified: pyxfce/trunk/util/rc.defs === --- pyxfce/trunk/util/rc.defs 2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/rc.defs 2009-01-11 13:44:31 UTC (rev 29151) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-rc.h +;; From xfce-rc.h (define-function rc_simple_open (c-name "xfce_rc_simple_open") Modified: pyxfce/trunk/util/resource.defs === --- pyxfce/trunk/util/resource.defs 2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/resource.defs 2009-01-11 13:44:31 UTC (rev 29151) @@ -16,7 +16,7 @@ ) -;; From /usr/local/include/xfce4/libxfce4util/xfce-resource.h +;; From xfce-resource.h (define-function resource_dirs (c-name "xfce_resource_dirs") Modified: pyxfce/trunk/util/utf8.defs === --- pyxfce/trunk/util/utf8.defs 2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/utf8.defs 2009-01-11 13:44:31 UTC (rev 29151) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-utf8.h +;; From xfce-utf8.h (define-function utf8_remove_controls (c-name "xfce_utf8_remove_controls") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29152 - pyxfce/trunk/panel
Author: dannym Date: 2009-01-11 14:26:42 + (Sun, 11 Jan 2009) New Revision: 29152 Modified: pyxfce/trunk/panel/enums.c pyxfce/trunk/panel/enums.override pyxfce/trunk/panel/plugin_iface.c pyxfce/trunk/panel/plugin_iface.override pyxfce/trunk/panel/window.c pyxfce/trunk/panel/window.override Log: use 'libxfce4-panel-enums.h', fixes bug#3054. Modified: pyxfce/trunk/panel/enums.c === --- pyxfce/trunk/panel/enums.c 2009-01-11 13:44:31 UTC (rev 29151) +++ pyxfce/trunk/panel/enums.c 2009-01-11 14:26:42 UTC (rev 29152) @@ -8,7 +8,7 @@ #include "pygobject.h" #include #include -#include +#include extern PyTypeObject PyGtkWidget_Type; @@ -30,8 +30,8 @@ /* --- functions --- */ -PyMethodDef pyenums_functions[] = { -{ NULL, NULL, 0 } +const PyMethodDef pyenums_functions[] = { +{ NULL, NULL, 0, NULL } }; @@ -40,6 +40,9 @@ void pyenums_add_constants(PyObject *module, const gchar *strip_prefix) { +#ifdef VERSION +PyModule_AddStringConstant(module, "__version__", VERSION); +#endif pyg_enum_add(module, "ScreenPosition", strip_prefix, XFCE_TYPE_SCREEN_POSITION); if (PyErr_Occurred()) @@ -53,34 +56,30 @@ PyObject *module; if ((module = PyImport_ImportModule("gobject")) != NULL) { -PyObject *moddict = PyModule_GetDict(module); - -_PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject"); +_PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject"); if (_PyGObject_Type == NULL) { PyErr_SetString(PyExc_ImportError, "cannot import name GObject from gobject"); -return; +return ; } } else { PyErr_SetString(PyExc_ImportError, "could not import gobject"); -return; +return ; } if ((module = PyImport_ImportModule("gtk")) != NULL) { -PyObject *moddict = PyModule_GetDict(module); - -_PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget"); +_PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget"); if (_PyGtkWidget_Type == NULL) { PyErr_SetString(PyExc_ImportError, "cannot import name Widget from gtk"); -return; +return ; } } else { PyErr_SetString(PyExc_ImportError, "could not import gtk"); -return; +return ; } -#line 86 "enums.c" +#line 85 "enums.c" } Modified: pyxfce/trunk/panel/enums.override === --- pyxfce/trunk/panel/enums.override 2009-01-11 13:44:31 UTC (rev 29151) +++ pyxfce/trunk/panel/enums.override 2009-01-11 14:26:42 UTC (rev 29152) @@ -6,7 +6,7 @@ #include "pygobject.h" #include #include -#include +#include extern PyTypeObject PyGtkWidget_Type; Modified: pyxfce/trunk/panel/plugin_iface.c === --- pyxfce/trunk/panel/plugin_iface.c 2009-01-11 13:44:31 UTC (rev 29151) +++ pyxfce/trunk/panel/plugin_iface.c 2009-01-11 14:26:42 UTC (rev 29152) @@ -8,7 +8,7 @@ #include "pygobject.h" #include #include -#include +#include extern PyTypeObject PyGtkWidget_Type; @@ -27,7 +27,7 @@ /* -- forward type declarations -- */ -PyTypeObject PyXfcePanelPlugin_Type; +PyTypeObject G_GNUC_INTERNAL PyXfcePanelPlugin_Type; #line 33 "plugin_iface.c" @@ -38,11 +38,16 @@ static PyObject * _wrap_xfce_panel_plugin_get_name(PyGObject *self) { -const gchar *ret; +gchar *ret; + ret = xfce_panel_plugin_get_name(XFCE_PANEL_PLUGIN(self->obj)); -if (ret) -return PyString_FromString(ret); + +if (ret) { +PyObject *py_ret = PyString_FromString(ret); +g_free(ret); +return py_ret; +} Py_INCREF(Py_None); return Py_None; } @@ -50,11 +55,16 @@ static PyObject * _wrap_xfce_panel_plugin_get_id(PyGObject *self) { -const gchar *ret; +gchar *ret; + ret = xfce_panel_plugin_get_id(XFCE_PANEL_PLUGIN(self->obj)); -if (ret) -return PyString_FromString(ret); + +if (ret) { +PyObject *py_ret = PyString_FromString(ret); +g_free(ret); +return py_ret; +} Py_INCREF(Py_None); return Py_None; } @@ -62,11 +72,16 @@ static PyObject * _wrap_xfce_panel_plugin_get_display_name(PyGObject *self) { -const gchar *ret; +gchar *ret; + ret = xfce_panel_plugin_get_display_name(XFCE_PANEL_PLUGIN(self->obj)); -if (ret) -return PyString_FromString(ret); + +if (ret) { +PyObject *py_ret = PyString_FromString(ret); +g_free(ret); +return py_ret; +} Py_INCREF(Py_None); return Py_None; } @@ -76,7 +91,9 @@ { int ret; + ret = xfce_panel_plugin_get_s
[Xfce4-commits] r29158 - in xfce4-mixer/branches/xfce_4_4: . src
Author: dannym Date: 2009-01-11 15:04:44 + (Sun, 11 Jan 2009) New Revision: 29158 Added: xfce4-mixer/branches/xfce_4_4/src/xfce4-mixer.desktop.in Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog xfce4-mixer/branches/xfce_4_4/src/Makefile.am Log: add '.desktop' file for mixer application (so that you can use it as standalone application) (fixes bug# 2889). Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog === --- xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 14:55:39 UTC (rev 29157) +++ xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 15:04:44 UTC (rev 29158) @@ -1,3 +1,7 @@ +2009-01-11 15:47 dannym + + * add "src/xfce4-mixer.desktop.in". + 2008-10-22 21:37 lars * po/da.po: update-po Modified: xfce4-mixer/branches/xfce_4_4/src/Makefile.am === --- xfce4-mixer/branches/xfce_4_4/src/Makefile.am 2009-01-11 14:55:39 UTC (rev 29157) +++ xfce4-mixer/branches/xfce_4_4/src/Makefile.am 2009-01-11 15:04:44 UTC (rev 29158) @@ -67,6 +67,11 @@ #%.c %.h %-private.h: %.gob # @GOB2@ $< +appsdir = $(datadir)/applications +apps_in_files = xfce4-mixer.desktop.in +apps_DATA = $(apps_in_files:.desktop.in=.desktop) +...@intltool_desktop_rule@ + ACLOCAL_AMFLAGS = -I m4 xfce4_mixer_DEPENDENCIES = $(top_builddir)/lib/libxfce4mixer.la @@ -86,5 +91,7 @@ mixer-switch.gob\ mixer-view-tiny.gob \ mixer-view.gob \ - mixer-window.gob + mixer-window.gob \ + $(apps_in_files) +DISTCLEANFILES = $(apps_DATA) Added: xfce4-mixer/branches/xfce_4_4/src/xfce4-mixer.desktop.in === --- xfce4-mixer/branches/xfce_4_4/src/xfce4-mixer.desktop.in (rev 0) +++ xfce4-mixer/branches/xfce_4_4/src/xfce4-mixer.desktop.in2009-01-11 15:04:44 UTC (rev 29158) @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Name=Volume Control +Type=Application +Comment=Mixer GUI +Exec=xfce4-mixer +TryExec=xfce4-mixer +Icon=multimedia-volume-control +Categories=Application;AudioVideo; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29159 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2009-01-11 15:22:19 + (Sun, 11 Jan 2009) New Revision: 29159 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c Log: fix bug# 2267 (border around slider)... Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c 2009-01-11 15:04:44 UTC (rev 29158) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c 2009-01-11 15:22:19 UTC (rev 29159) @@ -438,6 +438,7 @@ t_mixer *mixer; GdkPixbuf *pb; GtkWidget *align; + GtkWidget *slider_box; mixer = g_new0 (t_mixer, 1); @@ -463,6 +464,10 @@ gtk_box_pack_start (GTK_BOX (mixer->box), GTK_WIDGET (mixer->ib), TRUE, TRUE, 0); + slider_box = gtk_hbox_new (FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (slider_box), 2); + gtk_widget_show (slider_box); + mixer->slider = XFCE_MIXER_CONTROL (xfce_mixer_slider_tiny_new ()); g_signal_connect ( G_OBJECT (mixer->slider), "notify::value", @@ -470,7 +475,8 @@ ); gtk_widget_show (GTK_WIDGET (mixer->slider)); - gtk_box_pack_start (GTK_BOX (mixer->box), GTK_WIDGET (mixer->slider), FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (slider_box), GTK_WIDGET (mixer->slider), FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (mixer->box), GTK_WIDGET (slider_box), FALSE, FALSE, 0); g_signal_connect_swapped ( G_OBJECT (mixer->ib), "scroll-event", ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29160 - xfce4-mixer/branches/xfce_4_4/lib
Author: dannym Date: 2009-01-11 15:54:13 + (Sun, 11 Jan 2009) New Revision: 29160 Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c Log: fix bug# 3680. Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c === --- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 15:22:19 UTC (rev 29159) +++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 15:54:13 UTC (rev 29160) @@ -135,14 +135,14 @@ } if ((err = snd_mixer_attach(handle, card)) < 0) { - error(_("alsa: Mixer attach %s error: %s\n"), card, snd_strerror(err)); + error(_("alsa: snd_mixer_attach(\"%s\"): error: %s\n"), card, snd_strerror(err)); snd_mixer_close(handle); /* <-- alsa 0.9.3a fails assert(hctl) if I do that... wird... */ handle = NULL; return; } if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) { #ifdef DEBUG - error(_("alsa: Mixer register error: %s\n"), snd_strerror(err)); + error(_("alsa: snd_mixer_selem_register(...): error: %s\n"), snd_strerror(err)); #endif snd_mixer_close(handle); handle = NULL; @@ -614,7 +614,7 @@ } } - stringlist_free (g); + vc_free_choices (g); } static gchar *vc_get_select(char const *which) @@ -622,7 +622,8 @@ gint j; unsigned int jj; GList *g; - gchar *s; + volchoice_t* item; + snd_mixer_elem_t *xelem = NULL; if (handle == NULL) { return NULL; @@ -643,13 +644,15 @@ if (!g) return NULL; - s = (gchar *) g_list_nth_data (g, j); + item = (volchoice_t *) g_list_nth_data (g, j); - if (!s) + if (!item) { + vc_free_choices (g); return NULL; + } - s = g_strdup (s); - stringlist_free (g); + s = g_strdup (item->name); + vc_free_choices (g); return s; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29161 - xfce4-mixer/branches/xfce_4_4/po
Author: dannym Date: 2009-01-11 16:01:23 + (Sun, 11 Jan 2009) New Revision: 29161 Modified: xfce4-mixer/branches/xfce_4_4/po/am.po xfce4-mixer/branches/xfce_4_4/po/ar.po xfce4-mixer/branches/xfce_4_4/po/az.po xfce4-mixer/branches/xfce_4_4/po/be.po xfce4-mixer/branches/xfce_4_4/po/bg.po xfce4-mixer/branches/xfce_4_4/po/bn_IN.po xfce4-mixer/branches/xfce_4_4/po/ca.po xfce4-mixer/branches/xfce_4_4/po/cs.po xfce4-mixer/branches/xfce_4_4/po/de.po xfce4-mixer/branches/xfce_4_4/po/dz.po xfce4-mixer/branches/xfce_4_4/po/el.po xfce4-mixer/branches/xfce_4_4/po/en_GB.po xfce4-mixer/branches/xfce_4_4/po/es.po xfce4-mixer/branches/xfce_4_4/po/es_MX.po xfce4-mixer/branches/xfce_4_4/po/et.po xfce4-mixer/branches/xfce_4_4/po/eu.po xfce4-mixer/branches/xfce_4_4/po/fa.po xfce4-mixer/branches/xfce_4_4/po/fi.po xfce4-mixer/branches/xfce_4_4/po/fr.po xfce4-mixer/branches/xfce_4_4/po/gl.po xfce4-mixer/branches/xfce_4_4/po/gu.po xfce4-mixer/branches/xfce_4_4/po/he.po xfce4-mixer/branches/xfce_4_4/po/hi.po xfce4-mixer/branches/xfce_4_4/po/hu.po xfce4-mixer/branches/xfce_4_4/po/hy.po xfce4-mixer/branches/xfce_4_4/po/id.po xfce4-mixer/branches/xfce_4_4/po/it.po xfce4-mixer/branches/xfce_4_4/po/ja.po xfce4-mixer/branches/xfce_4_4/po/ka.po xfce4-mixer/branches/xfce_4_4/po/ko.po xfce4-mixer/branches/xfce_4_4/po/lt.po xfce4-mixer/branches/xfce_4_4/po/lv.po xfce4-mixer/branches/xfce_4_4/po/mk.po xfce4-mixer/branches/xfce_4_4/po/mr.po xfce4-mixer/branches/xfce_4_4/po/ms.po xfce4-mixer/branches/xfce_4_4/po/nb_NO.po xfce4-mixer/branches/xfce_4_4/po/nl.po xfce4-mixer/branches/xfce_4_4/po/pa.po xfce4-mixer/branches/xfce_4_4/po/pl.po xfce4-mixer/branches/xfce_4_4/po/pt_BR.po xfce4-mixer/branches/xfce_4_4/po/pt_PT.po xfce4-mixer/branches/xfce_4_4/po/ro.po xfce4-mixer/branches/xfce_4_4/po/ru.po xfce4-mixer/branches/xfce_4_4/po/si.po xfce4-mixer/branches/xfce_4_4/po/sk.po xfce4-mixer/branches/xfce_4_4/po/sq.po xfce4-mixer/branches/xfce_4_4/po/sv.po xfce4-mixer/branches/xfce_4_4/po/ta.po xfce4-mixer/branches/xfce_4_4/po/tr.po xfce4-mixer/branches/xfce_4_4/po/uk.po xfce4-mixer/branches/xfce_4_4/po/vi.po xfce4-mixer/branches/xfce_4_4/po/xfce4-mixer.pot xfce4-mixer/branches/xfce_4_4/po/zh_CN.po xfce4-mixer/branches/xfce_4_4/po/zh_TW.po Log: fix msgid for 'vc_alsa.c', update translations accordingly. Modified: xfce4-mixer/branches/xfce_4_4/po/am.po === --- xfce4-mixer/branches/xfce_4_4/po/am.po 2009-01-11 15:54:13 UTC (rev 29160) +++ xfce4-mixer/branches/xfce_4_4/po/am.po 2009-01-11 16:01:23 UTC (rev 29161) @@ -210,12 +210,12 @@ #: ../lib/vc_alsa.c:141 #, c-format -msgid "alsa: Mixer attach %s error: %s\n" +msgid "alsa: snd_mixer_attach(\"%s\"): error: %s\n" msgstr "" #: ../lib/vc_alsa.c:149 #, c-format -msgid "alsa: Mixer register error: %s\n" +msgid "alsa: snd_mixer_selem_register(...): error: %s\n" msgstr "" #: ../lib/vc_alsa.c:158 Modified: xfce4-mixer/branches/xfce_4_4/po/ar.po === --- xfce4-mixer/branches/xfce_4_4/po/ar.po 2009-01-11 15:54:13 UTC (rev 29160) +++ xfce4-mixer/branches/xfce_4_4/po/ar.po 2009-01-11 16:01:23 UTC (rev 29161) @@ -208,12 +208,12 @@ #: ../lib/vc_alsa.c:141 #, c-format -msgid "alsa: Mixer attach %s error: %s\n" +msgid "alsa: snd_mixer_attach(\"%s\"): error: %s\n" msgstr "" #: ../lib/vc_alsa.c:149 #, c-format -msgid "alsa: Mixer register error: %s\n" +msgid "alsa: snd_mixer_selem_register(...): error: %s\n" msgstr "" #: ../lib/vc_alsa.c:158 Modified: xfce4-mixer/branches/xfce_4_4/po/az.po === --- xfce4-mixer/branches/xfce_4_4/po/az.po 2009-01-11 15:54:13 UTC (rev 29160) +++ xfce4-mixer/branches/xfce_4_4/po/az.po 2009-01-11 16:01:23 UTC (rev 29161) @@ -209,12 +209,12 @@ #: ../lib/vc_alsa.c:141 #, c-format -msgid "alsa: Mixer attach %s error: %s\n" +msgid "alsa: snd_mixer_attach(\"%s\"): error: %s\n" msgstr "alsa: Mikser %s ilişdirmə xətası: %s\n" #: ../lib/vc_alsa.c:149 #, c-format -msgid "alsa: Mixer register error: %s\n" +msgid "alsa: snd_mixer_selem_register(...): error: %s\n" msgstr "alsa: Mikser qeydi xətası: %s\n" #: ../lib/vc_alsa.c:158 Modified: xfce4-mixer/branches/xfce_4_4/po/be.po === --- xfce4-mixer/branches/xfce_4_4/po/be.po 2009-01-11 15:54:13 UTC (rev 29160) +++ xfce4-mixer/branches/xfce_4_4/po/be.po 2009-01-11 16:01:23 UTC (rev 29161) @@ -211,12 +211,12 @@ #: ../lib/vc_alsa.c:141 #, c-format -msgid "alsa: Mixer attach %s error: %s\n" +msgid "alsa: snd_mixer_attach(\"%s\"): error: %s\n" msgstr "alsa: далучэньне мікшара %s памылка: %s\n" #: ../lib/vc_alsa.c:149 #, c-format -msgid "alsa: Mixer
[Xfce4-commits] r29162 - in xfce4-mixer/branches/xfce_4_4: . lib
Author: dannym Date: 2009-01-11 16:02:32 + (Sun, 11 Jan 2009) New Revision: 29162 Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c Log: apply patch to honor left/right balance from Oliver (fixes bug# 2611). Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog === --- xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 16:01:23 UTC (rev 29161) +++ xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 16:02:32 UTC (rev 29162) @@ -1,3 +1,11 @@ +2009-01-11 17:02 dannym + + * apply patch to honor left/right balance. + +2009-01-11 17:00 dannym + + * fix "lib/vc_alsa.c" memory leak. + 2009-01-11 15:47 dannym * add "src/xfce4-mixer.desktop.in". Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c === --- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 16:01:23 UTC (rev 29161) +++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 16:02:32 UTC (rev 29162) @@ -232,6 +232,16 @@ return elem; } +static double calculate_balance_ratio(long left, long right) +{ + return (left != right) ? (left > right ? (double)left / right : 0 -(double)right / left) : 0; +} + +static long calculate_volume_delta(long left, long right, long new) +{ + return new - ((left + right) >> 1); +} + static int vc_get_volume(char const *which) { int playback_enable; @@ -315,10 +325,11 @@ long playback_max; long capture_min; long capture_max; - long playback_value; + long delta; + long playback_value, playback_value_left, playback_value_right; long capture_value; - double playback_value_double; - double capture_value_double; + long playback_value_current_left, playback_value_current_right; + static double balance; /*snd_mixer_selem_channel_id_t chn;*/ snd_mixer_elem_t *xelem; @@ -335,34 +346,43 @@ snd_mixer_selem_get_playback_volume_range (xelem, &playback_min, &playback_max); snd_mixer_selem_get_capture_volume_range (xelem, &capture_min, &capture_max); + snd_mixer_selem_get_playback_volume(xelem, SND_MIXER_SCHN_FRONT_LEFT, &playback_value_current_left); + snd_mixer_selem_get_playback_volume(xelem, SND_MIXER_SCHN_FRONT_RIGHT, &playback_value_current_right); + if (playback_value_current_left && playback_value_current_right) { + balance = calculate_balance_ratio(playback_value_current_left, playback_value_current_right); + } + playback_min = 0; capture_min = 0; /*vol_p = (lval - pmin) * 100 / (pmax - pmin);*/ - playback_value_double = vol_p; - capture_value_double = vol_p; - if (vol_p != 0) { - playback_value_double += 0.99; - capture_value_double += 0.99; - } - - playback_value = (long) playback_min + (playback_value_double) * (playback_max - playback_min) / 100; - capture_value = (long) capture_min + (capture_value_double) * (capture_max - capture_min) / 100; + playback_value = (long)(((double)(vol_p *playback_max) /100) +0.5); + capture_value = (long)(((double)(vol_p *capture_max) /100) +0.5); + delta = calculate_volume_delta(playback_value_current_left, playback_value_current_right, playback_value); + + /* FIXME +* This doesn't always work perfectly, due to rounding delta might endup being +1 instead of 0. +* Though not audiable, it might be visible on the slider. +*/ + playback_value_left = playback_value_current_left +delta; + playback_value_right = playback_value_current_right +delta; + + /* TODO +* Clipping top and bottom isn't respected yet. +*/ + /* snd_mixer_selem_get_playback_switch(Ex_elem, SND_MIXER_SCHN_MONO, &status); */ - /* use _all functions for sami's card ... */ - if (playback_value == 0) /* mute */ - snd_mixer_selem_set_playback_switch_all (xelem, 0); - else /* unmute, just in case. */ - snd_mixer_selem_set_playback_switch_all (xelem, 1); - - snd_mixer_selem_set_playback_volume_all (xelem, playback_value); + snd_mixer_selem_set_playback_switch(xelem, SND_MIXER_SCHN_FRONT_LEFT, playback_value_left); + snd_mixer_selem_set_playback_switch(xelem, SND_MIXER_SCHN_FRONT_RIGHT, playback_value_right); + + snd_mixer_selem_set_playback_volume(xelem, SND_MIXER_SCHN_FRONT_LEFT, playback_value_left); + snd_mixer_selem_set_playback_volume(xelem, SND_MIXER_SCHN_FRONT_RIGHT, playback_value_right); snd_mixer_selem_set_capture_volume_all (xelem, capture_value); - #if 0 for (chn = 0; chn <= SND_MIXER_SCHN_LAST; chn++) { if (!snd_mixer_selem_has_playback_channel(xelem, chn))
[Xfce4-commits] r29164 - in xfce4-mixer/branches/xfce_4_4: . lib
Author: dannym Date: 2009-01-11 16:53:03 + (Sun, 11 Jan 2009) New Revision: 29164 Added: xfce4-mixer/branches/xfce_4_4/lib/libxfce4mixer-1.0.pc.in Modified: xfce4-mixer/branches/xfce_4_4/configure.in.in xfce4-mixer/branches/xfce_4_4/lib/Makefile.am xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c Log: fix 'libxfce4mixer' header usage. Modified: xfce4-mixer/branches/xfce_4_4/configure.in.in === --- xfce4-mixer/branches/xfce_4_4/configure.in.in 2009-01-11 16:29:13 UTC (rev 29163) +++ xfce4-mixer/branches/xfce_4_4/configure.in.in 2009-01-11 16:53:03 UTC (rev 29164) @@ -120,6 +120,7 @@ xfce4-mixer.spec include/Makefile lib/Makefile +lib/libxfce4mixer-1.0.pc src/Makefile panel-plugin/Makefile settings/Makefile Modified: xfce4-mixer/branches/xfce_4_4/lib/Makefile.am === --- xfce4-mixer/branches/xfce_4_4/lib/Makefile.am 2009-01-11 16:29:13 UTC (rev 29163) +++ xfce4-mixer/branches/xfce_4_4/lib/Makefile.am 2009-01-11 16:53:03 UTC (rev 29164) @@ -6,8 +6,13 @@ plugindir = $(libdir)/xfce4/modules -plugin_LTLIBRARIES = libxfce4mixer.la +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libxfce4mixer-1.0.pc +lib_LTLIBRARIES = libxfce4mixer.la + +#plugin_LTLIBRARIES = libxfce4mixer.la + libxfce4mixer_la_SOURCES = trans.c vc_alsa.c vc_alsa_fallback.c vc.c vc_oss.c vcs.c vc_sun.c vc_sgi.c stringlist.inc libxfce4mixer_la_LDFLAGS = -export-dynamic @@ -18,3 +23,8 @@ test_vc_CFLAGS = @GTK_CFLAGS@ @XFCE4_UTIL_CFLAGS@ test_vc_LDFLAGS = @GTK_LIBS@ @XFCE4_UTIL_LIBS@ libxfce4mixer.la noinst_PROGRAMS = test_vc + +xfce4_mixerincludedir = $(includedir)/xfce4/libxfce4mixer + +xfce4_mixerinclude_HEADERS = ../include/vc.h + Added: xfce4-mixer/branches/xfce_4_4/lib/libxfce4mixer-1.0.pc.in === --- xfce4-mixer/branches/xfce_4_4/lib/libxfce4mixer-1.0.pc.in (rev 0) +++ xfce4-mixer/branches/xfce_4_4/lib/libxfce4mixer-1.0.pc.in 2009-01-11 16:53:03 UTC (rev 29164) @@ -0,0 +1,14 @@ +pref...@prefix@ +datad...@datadir@ +exec_pref...@exec_prefix@ +libd...@libdir@ +libexecd...@libexecdir@ +included...@includedir@ +localed...@localedir@ + +Name: libxfce4mixer +Description: Library for the Xfce Mixer +Requires: glib-2.0 +Version: @VERSION@ +Libs: -L${libdir} -lxfce4mixer +Cflags: -I${includedir}/xfce4/ Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c === --- xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c 2009-01-11 16:29:13 UTC (rev 29163) +++ xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c 2009-01-11 16:53:03 UTC (rev 29164) @@ -69,8 +69,6 @@ #include -#include - #define VC_PLUGIN #include "vc.h" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29165 - xfce4-mixer/branches/xfce_4_4
Author: dannym Date: 2009-01-11 16:55:19 + (Sun, 11 Jan 2009) New Revision: 29165 Modified: xfce4-mixer/branches/xfce_4_4/configure.in.in Log: fix bug# 3253 (IRIX64 should not use OSS but SGI). Modified: xfce4-mixer/branches/xfce_4_4/configure.in.in === --- xfce4-mixer/branches/xfce_4_4/configure.in.in 2009-01-11 16:53:03 UTC (rev 29164) +++ xfce4-mixer/branches/xfce_4_4/configure.in.in 2009-01-11 16:55:19 UTC (rev 29165) @@ -33,7 +33,7 @@ if test x"$with_sound" != x"alsa" -a x"$with_sound" != x"oss" -a x"$with_sound" != x"sun" -a x"$with_sound" != x"sgi"; then if test x`uname -s` != x"SunOS"; then -if test x`uname -s` != x"IRIX"; then +if test x`uname -s` != x"IRIX" -a x`uname -s` != x"IRIX64"; then with_sound=oss else with_sound=sgi ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29166 - in xfce4-mixer/branches/xfce_4_4: . include lib
Author: dannym Date: 2009-01-11 16:59:20 + (Sun, 11 Jan 2009) New Revision: 29166 Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog xfce4-mixer/branches/xfce_4_4/include/vc.h xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c Log: fix 'vc_alsa' API usage. Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog === --- xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 16:55:19 UTC (rev 29165) +++ xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 16:59:20 UTC (rev 29166) @@ -1,3 +1,11 @@ +2009-01-11 18:00 dannym + + * support IRIX64. + +2009-01-11 17:30 dannym + + * fix "libxfce4mixer" library. + 2009-01-11 17:02 dannym * apply patch to honor left/right balance. Modified: xfce4-mixer/branches/xfce_4_4/include/vc.h === --- xfce4-mixer/branches/xfce_4_4/include/vc.h 2009-01-11 16:55:19 UTC (rev 29165) +++ xfce4-mixer/branches/xfce_4_4/include/vc.h 2009-01-11 16:59:20 UTC (rev 29166) @@ -82,6 +82,7 @@ volchanger_t **first_vc(); volchanger_t **next_vc(volchanger_t **); +void vc_free_choices(GList* choices); #ifndef VC_PLUGIN /* these operate on the selected_vc: */ int vc_get_volume(char const *which); @@ -96,7 +97,6 @@ GList *vc_get_control_list(); void vc_free_control_list(GList *g); -void vc_free_choices(GList* choices); volchoice_t* vc_choice_dup(const volchoice_t *choice); void vc_set_volume_callback (volchanger_callback_t cb, void *data); Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c === --- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 16:55:19 UTC (rev 29165) +++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 16:59:20 UTC (rev 29166) @@ -643,6 +643,7 @@ unsigned int jj; GList *g; volchoice_t* item; + char* s; snd_mixer_elem_t *xelem = NULL; if (handle == NULL) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29167 - in xfce4-mixer/branches/xfce_4_4: include lib
Author: dannym Date: 2009-01-11 17:02:15 + (Sun, 11 Jan 2009) New Revision: 29167 Modified: xfce4-mixer/branches/xfce_4_4/include/vcs.h xfce4-mixer/branches/xfce_4_4/lib/Makefile.am Log: add 'vcs.h'. Modified: xfce4-mixer/branches/xfce_4_4/include/vcs.h === --- xfce4-mixer/branches/xfce_4_4/include/vcs.h 2009-01-11 16:59:20 UTC (rev 29166) +++ xfce4-mixer/branches/xfce_4_4/include/vcs.h 2009-01-11 17:02:15 UTC (rev 29167) @@ -1,6 +1,7 @@ #ifndef __MIXER_VCS_H #define __MIXER_VCS_H +/* call this at the beginning of your program. */ int register_vcs (); #include "vc.h" Modified: xfce4-mixer/branches/xfce_4_4/lib/Makefile.am === --- xfce4-mixer/branches/xfce_4_4/lib/Makefile.am 2009-01-11 16:59:20 UTC (rev 29166) +++ xfce4-mixer/branches/xfce_4_4/lib/Makefile.am 2009-01-11 17:02:15 UTC (rev 29167) @@ -26,5 +26,5 @@ xfce4_mixerincludedir = $(includedir)/xfce4/libxfce4mixer -xfce4_mixerinclude_HEADERS = ../include/vc.h +xfce4_mixerinclude_HEADERS = ../include/vc.h ../include/vcs.h ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29168 - xfce4-mixer/branches/xfce_4_4/lib
Author: dannym Date: 2009-01-11 17:15:12 + (Sun, 11 Jan 2009) New Revision: 29168 Modified: xfce4-mixer/branches/xfce_4_4/lib/trans.c Log: fix bug# 3254: add SGI Mixer control names. Modified: xfce4-mixer/branches/xfce_4_4/lib/trans.c === --- xfce4-mixer/branches/xfce_4_4/lib/trans.c 2009-01-11 17:02:15 UTC (rev 29167) +++ xfce4-mixer/branches/xfce_4_4/lib/trans.c 2009-01-11 17:15:12 UTC (rev 29168) @@ -64,10 +64,13 @@ /* * IRIX AL translatable names * - * The strings below come from SGI O2 + * The strings below come from SGI + * O2 * (Iris Audio Processor: version A3 revision 0) + * Fuel + * (Iris Audio Processor: version MAD revision 1, number 1) * - * If you have an another processor (e.g. A2, RAD, MAD) and + * If you have an another processor (e.g. A2, RAD) and * Device/Interface names, let me know. * */ @@ -77,6 +80,9 @@ _("A3.AnalogIn"), /* Analog In*/ _("A3.AnalogOut"), /* Analog Out */ _("A3.AnalogOut2"), /* Analog Out 2 */ + _("MAD1.AnalogIn"), /* Analog In*/ + _("MAD1.AnalogOut"),/* Analog Out */ + _("MAD1.AESOut"), /* AES Out */ /* Interface */ _("A3.CameraMic"), /* Camera Mic */ _("A3.Microphone"), /* Microphone */ @@ -85,7 +91,10 @@ _("A3.DAC2In"), /* DAC2 In */ _("A3.Speaker"),/* Speaker/Line Out */ _("A3.LineOut2"), /* Line Out 2 */ + _("MAD1.Microphone"), /* Microphone */ + _("MAD1.LineIn"), /* Line In */ + _("MAD1.LineOut"), /* Line Out */ + _("MAD1.AESOut"), /* AES Output */ }; /* vi: set ts=4 sw=4 cindent: */ - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29169 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2009-01-11 17:59:09 + (Sun, 11 Jan 2009) New Revision: 29169 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c Log: fix bug# 3651 (block panel menu), thanks, Mike. Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c 2009-01-11 17:15:12 UTC (rev 29168) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c 2009-01-11 17:59:09 UTC (rev 29169) @@ -127,6 +127,8 @@ { t_mixer *mixer = (t_mixer *) user_data; +xfce_panel_plugin_unblock_menu (mixer->temp_plugin); + xfce_mixer_prefbox_save_preferences (mixer->prefbox, mixer->prefs); mixer_write_config(mixer->temp_plugin, mixer); @@ -149,11 +151,13 @@ mixer = (t_mixer *) user_data; +xfce_panel_plugin_block_menu (plugin); + /* TODO TRANSLATE TITLE OR SOMETHING */ dialog = GTK_DIALOG ( gtk_dialog_new_with_buttons (xfce_panel_plugin_get_name (plugin), - GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(plugin))), + NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL)); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29170 - in xfce4-mixer/branches/xfce_4_4: include lib src
Author: dannym Date: 2009-01-11 19:33:42 + (Sun, 11 Jan 2009) New Revision: 29170 Modified: xfce4-mixer/branches/xfce_4_4/include/vc.h xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c xfce4-mixer/branches/xfce_4_4/src/main.c Log: try to add support for detecting the unloading of an ALSA module (bug# 3374 etc). Modified: xfce4-mixer/branches/xfce_4_4/include/vc.h === --- xfce4-mixer/branches/xfce_4_4/include/vc.h 2009-01-11 17:59:09 UTC (rev 29169) +++ xfce4-mixer/branches/xfce_4_4/include/vc.h 2009-01-11 19:33:42 UTC (rev 29170) @@ -31,8 +31,13 @@ /* this is the volume changer stuff */ -typedef void (*volchanger_callback_t)(char const *which, void *privdata); +typedef enum { + VE_VALUE_CHANGED, + VE_REMOVED, +} volchanger_callback_event_t; +typedef void (*volchanger_callback_t)(char const *which, volchanger_callback_event_t kind, void *privdata); + typedef enum { CT_SLIDER = 0, CT_ONOFF = 1, @@ -56,6 +61,10 @@ void (*vc_set_switch)(char const *which, gboolean b); char const *(*vc_get_device)(void); void (*vc_handle_events)(void); + void (*__dummy_1)(void); + void (*__dummy_2)(void); + void (*__dummy_3)(void); + void (*__dummy_4)(void); } volchanger_t; typedef struct { @@ -66,11 +75,15 @@ /* only for type == CT_SELECT: */ GList *choices; /* list item = volchoice_t */ + void* __dummy_1; + void* __dummy_2; } volcontrol_t; typedef struct { - gchar* name; - gchar* displayname; + gchar* name; + gchar* displayname; + void* __dummy_1; + int__dummy_2; } volchoice_t; /* choices entry for select */ void register_vc(volchanger_t *vc); @@ -122,7 +135,11 @@ vc_get_switch: vc_get_switch, \ vc_set_switch: vc_set_switch, \ vc_get_device: vc_get_device, \ -vc_handle_events: vc_handle_events \ +vc_handle_events: vc_handle_events, \ +__dummy_1: 0, \ +__dummy_2: 0, \ +__dummy_3: 0, \ +__dummy_4: 0 \ }; \ \ int register_##a(void) \ Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c === --- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 17:59:09 UTC (rev 29169) +++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 19:33:42 UTC (rev 29170) @@ -499,15 +499,27 @@ static int alsa_cb(snd_mixer_t *ctl, unsigned int mask, snd_mixer_elem_t *elem) { const char *which; + volchanger_callback_event_t event; + g_warning ("alsa_cb\n"); + + if (elem && snd_mixer_elem_get_type (elem) == SND_MIXER_ELEM_SIMPLE) { which = snd_mixer_selem_get_name (elem); } else { which = NULL; } - + + if (mask == SND_CTL_EVENT_MASK_REMOVE) { + event = VE_REMOVED; + } else if (mask & (SND_CTL_EVENT_MASK_VALUE | SND_CTL_EVENT_MASK_INFO)) { + event = VE_VALUE_CHANGED; + } else { + return 0; + } + if (mycb) - (*mycb) (which, mydata); + (*mycb) (which, event, mydata); return 0; } @@ -526,6 +538,7 @@ snd_mixer_set_callback_private (handle, data); snd_mixer_set_callback (handle, alsa_cb); + /* snd_mixer_elem_set_callback(elem, melem_event); */ } static void vc_close_device() Modified: xfce4-mixer/branches/xfce_4_4/src/main.c === --- xfce4-mixer/branches/xfce_4_4/src/main.c2009-01-11 17:59:09 UTC (rev 29169) +++ xfce4-mixer/branches/xfce_4_4/src/main.c2009-01-11 19:33:42 UTC (rev 29170) @@ -27,7 +27,7 @@ static guint src; -static void vol_changed_cb (char const *vcname, void *privdata) +static void vol_changed_cb (char const *vcname, volchanger_callback_event_t kind, void *privdata) { if (mixer_window) { xfce_mixer_window_refresh_value (XFCE_MIXER_WINDOW (mixer_window), vcname); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29171 - xfce4-mixer/branches/xfce_4_4
Author: dannym Date: 2009-01-11 19:34:53 + (Sun, 11 Jan 2009) New Revision: 29171 Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog Log: update ChangeLog. Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog === --- xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 19:33:42 UTC (rev 29170) +++ xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 19:34:53 UTC (rev 29171) @@ -1,3 +1,7 @@ +2009-01-11 20:38 dannym + + * libxfce4mixer: notification when the sound driver is being unloaded. + 2009-01-11 18:00 dannym * support IRIX64. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29172 - xfce4-mixer/branches/xfce_4_4/src
Author: dannym Date: 2009-01-11 19:36:07 + (Sun, 11 Jan 2009) New Revision: 29172 Modified: xfce4-mixer/branches/xfce_4_4/src/main.c Log: fix recurring 'handle_events'. Modified: xfce4-mixer/branches/xfce_4_4/src/main.c === --- xfce4-mixer/branches/xfce_4_4/src/main.c2009-01-11 19:34:53 UTC (rev 29171) +++ xfce4-mixer/branches/xfce_4_4/src/main.c2009-01-11 19:36:07 UTC (rev 29172) @@ -38,7 +38,7 @@ timer_vc_cb (gpointer data) { vc_handle_events (); - vol_changed_cb (NULL, NULL); + vol_changed_cb (NULL, VE_VALUE_CHANGED, NULL); return TRUE; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29173 - xfce4-mixer/branches/xfce_4_4/include
Author: dannym Date: 2009-01-11 19:37:33 + (Sun, 11 Jan 2009) New Revision: 29173 Modified: xfce4-mixer/branches/xfce_4_4/include/vcs.h Log: fix recurring 'handle_events'. Modified: xfce4-mixer/branches/xfce_4_4/include/vcs.h === --- xfce4-mixer/branches/xfce_4_4/include/vcs.h 2009-01-11 19:36:07 UTC (rev 29172) +++ xfce4-mixer/branches/xfce_4_4/include/vcs.h 2009-01-11 19:37:33 UTC (rev 29173) @@ -4,6 +4,11 @@ /* call this at the beginning of your program. */ int register_vcs (); +/* Optionally register a event callback (per device) with + vc_set_volume_callback(callback, user_data); + call vc_handle_events() periodically. + */ + #include "vc.h" #endif ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29174 - xfce4-mixer/branches/xfce_4_4/settings
Author: dannym Date: 2009-01-11 19:46:39 + (Sun, 11 Jan 2009) New Revision: 29174 Modified: xfce4-mixer/branches/xfce_4_4/settings/mixer-settingsbox.gob xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox-private.h xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox.c xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox.h Log: add a 'device removed' callback to the settings dialog (disconnects from the sound device). Note that it only reconnects when you enter the dialog again. Modified: xfce4-mixer/branches/xfce_4_4/settings/mixer-settingsbox.gob === --- xfce4-mixer/branches/xfce_4_4/settings/mixer-settingsbox.gob 2009-01-11 19:37:33 UTC (rev 29173) +++ xfce4-mixer/branches/xfce_4_4/settings/mixer-settingsbox.gob 2009-01-11 19:46:39 UTC (rev 29174) @@ -42,6 +42,14 @@ return s; } +static void volume_event_cb(char const *control, volchanger_callback_event_t kind, void *p_settings_box) +{ + if (kind == VE_REMOVED) { + g_warning ("sound device was removed."); + vc_close_device (); + } +} + %} class Xfce:Mixer:Settingsbox from Gtk:VBox { @@ -219,7 +227,9 @@ gtk_label_set_text (self->dev_label, s); TRACE ("set vc device"); + vc_set_volume_callback (NULL, NULL); vc_set_device (s); + vc_set_volume_callback (volume_event_cb, self); TRACE ("free sel_device"); if (self->sel_device) { g_free (self->sel_device); Modified: xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox-private.h === --- xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox-private.h 2009-01-11 19:37:33 UTC (rev 29173) +++ xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox-private.h 2009-01-11 19:46:39 UTC (rev 29174) @@ -1,4 +1,4 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ #ifndef __XFCE_MIXER_SETTINGSBOX_PRIVATE_H__ #define __XFCE_MIXER_SETTINGSBOX_PRIVATE_H__ Modified: xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox.c === --- xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox.c 2009-01-11 19:37:33 UTC (rev 29173) +++ xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox.c 2009-01-11 19:46:39 UTC (rev 29174) @@ -1,16 +1,13 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ /* End world hunger, donate to the World Food Programme, http://www.wfp.org */ #define GOB_VERSION_MAJOR 2 #define GOB_VERSION_MINOR 0 -#define GOB_VERSION_PATCHLEVEL 14 +#define GOB_VERSION_PATCHLEVEL 15 #define selfp (self->_priv) -#ifdef HAVE_CONFIG_H -#include -#endif #include /* memset() */ #include "xfce-mixer-settingsbox.h" @@ -37,7 +34,7 @@ #include #include -#line 41 "xfce-mixer-settingsbox.c" +#line 38 "xfce-mixer-settingsbox.c" #line 12 "mixer-settingsbox.gob" @@ -73,8 +70,16 @@ return s; } +static void volume_event_cb(char const *control, volchanger_callback_event_t kind, void *p_settings_box) +{ + if (kind == VE_REMOVED) { + g_warning ("sound device was removed."); + vc_close_device (); + } +} -#line 78 "xfce-mixer-settingsbox.c" + +#line 83 "xfce-mixer-settingsbox.c" /* self casting macros */ #define SELF(x) XFCE_MIXER_SETTINGSBOX(x) #define SELF_CONST(x) XFCE_MIXER_SETTINGSBOX_CONST(x) @@ -161,26 +166,26 @@ #define device_lst (self->device_lst) #define VAR device_lst { -#line 59 "mixer-settingsbox.gob" +#line 67 "mixer-settingsbox.gob" stringlist_free(VAR); VAR = NULL; } -#line 170 "xfce-mixer-settingsbox.c" +#line 175 "xfce-mixer-settingsbox.c" memset(&device_lst, 0, sizeof(device_lst)); #undef VAR #undef device_lst #define sel_device (self->sel_device) #define VAR sel_device { -#line 64 "mixer-settingsbox.gob" +#line 72 "mixer-settingsbox.gob" if (VAR) { g_free (VAR); VAR = NULL; } } -#line 184 "xfce-mixer-settingsbox.c" +#line 189 "xfce-mixer-settingsbox.c" memset(&sel_device, 0, sizeof(sel_device)); #undef VAR #undef sel_device @@ -198,50 +203,50 @@ g_object_class->finalize = ___finalize; } #undef __GOB_FUNCTION__ -#line 114 "mixer-settingsbox.gob" +#line 122 "mixer-settingsbox.gob" static void xfce_mixer_settingsbox_init (XfceMixerSettingsbox * self G_GNUC_UNUSED) -#line 205 "xfce-mix
[Xfce4-commits] r29175 - xfce4-mixer/branches/xfce_4_4/lib
Author: dannym Date: 2009-01-11 19:49:01 + (Sun, 11 Jan 2009) New Revision: 29175 Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c Log: remove callback before closing device, just in case. Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c === --- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 19:46:39 UTC (rev 29174) +++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 19:49:01 UTC (rev 29175) @@ -547,6 +547,9 @@ return; } + snd_mixer_set_callback_private (handle, NULL); + snd_mixer_set_callback (handle, NULL); + snd_mixer_close (handle); /* FIXME does this close all related stuff? */ handle = NULL; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29178 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2009-01-11 20:40:09 + (Sun, 11 Jan 2009) New Revision: 29178 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c Log: update callback so that it will notice when the driver is being removed. Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c 2009-01-11 19:56:33 UTC (rev 29177) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c 2009-01-11 20:40:09 UTC (rev 29178) @@ -284,11 +284,16 @@ } -static void callback_vc_cb(char const *which, void *privdata) +static void callback_vc_cb(char const *which, volchanger_callback_event_t kind, void *privdata) { t_mixer *mixer; mixer = (t_mixer *) privdata; + if (kind == VE_REMOVED) { + vc_close_device (); + return; + } + xfce_mixer_control_vc_feed_value (mixer->slider); mixer_update_tips (mixer); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29179 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2009-01-11 20:51:23 + (Sun, 11 Jan 2009) New Revision: 29179 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.h xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences-private.h xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.h Log: update comments. Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h 2009-01-11 20:40:09 UTC (rev 29178) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h 2009-01-11 20:51:23 UTC (rev 29179) @@ -1,4 +1,4 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ #ifndef __XFCE_MIXER_PREFBOX_PRIVATE_H__ #define __XFCE_MIXER_PREFBOX_PRIVATE_H__ Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.h === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.h 2009-01-11 20:40:09 UTC (rev 29178) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.h 2009-01-11 20:51:23 UTC (rev 29179) @@ -1,4 +1,4 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ #include #include Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences-private.h === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences-private.h 2009-01-11 20:40:09 UTC (rev 29178) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences-private.h 2009-01-11 20:51:23 UTC (rev 29179) @@ -1,4 +1,4 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ #ifndef __XFCE_MIXER_PREFERENCES_PRIVATE_H__ #define __XFCE_MIXER_PREFERENCES_PRIVATE_H__ Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.h === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.h 2009-01-11 20:40:09 UTC (rev 29178) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.h 2009-01-11 20:51:23 UTC (rev 29179) @@ -1,4 +1,4 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ #include #include ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29180 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2009-01-11 20:52:13 + (Sun, 11 Jan 2009) New Revision: 29180 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.c xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.h xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.c Log: update comments. Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.c === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.c 2009-01-11 20:51:23 UTC (rev 29179) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.c 2009-01-11 20:52:13 UTC (rev 29180) @@ -1,10 +1,10 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ /* End world hunger, donate to the World Food Programme, http://www.wfp.org */ #define GOB_VERSION_MAJOR 2 #define GOB_VERSION_MINOR 0 -#define GOB_VERSION_PATCHLEVEL 14 +#define GOB_VERSION_PATCHLEVEL 15 #define selfp (self->_priv) Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.h === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.h 2009-01-11 20:51:23 UTC (rev 29179) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.h 2009-01-11 20:52:13 UTC (rev 29180) @@ -1,4 +1,4 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ #include #include Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c 2009-01-11 20:51:23 UTC (rev 29179) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c 2009-01-11 20:52:13 UTC (rev 29180) @@ -1,10 +1,10 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ /* End world hunger, donate to the World Food Programme, http://www.wfp.org */ #define GOB_VERSION_MAJOR 2 #define GOB_VERSION_MINOR 0 -#define GOB_VERSION_PATCHLEVEL 14 +#define GOB_VERSION_PATCHLEVEL 15 #define selfp (self->_priv) Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.c === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.c 2009-01-11 20:51:23 UTC (rev 29179) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.c 2009-01-11 20:52:13 UTC (rev 29180) @@ -1,10 +1,10 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ /* End world hunger, donate to the World Food Programme, http://www.wfp.org */ #define GOB_VERSION_MAJOR 2 #define GOB_VERSION_MINOR 0 -#define GOB_VERSION_PATCHLEVEL 14 +#define GOB_VERSION_PATCHLEVEL 15 #define selfp (self->_priv) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29181 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2009-01-11 21:11:34 + (Sun, 11 Jan 2009) New Revision: 29181 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny-private.h xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny.c xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny.h Log: fix bug# 3410: drag slider. Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob 2009-01-11 20:52:13 UTC (rev 29180) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob 2009-01-11 21:11:34 UTC (rev 29181) @@ -15,6 +15,7 @@ protected GtkProgressBar *progress = NULL; /*protected GtkBox *hbox = NULL;*/ public GtkEventBox *eb = NULL; + protected gboolean pressed = FALSE; protected void set_vval (self, gint vval) { @@ -63,6 +64,7 @@ g_signal_connect_swapped (self->eb, "scroll-event", G_CALLBACK(self_scroll_cb), self); g_signal_connect_swapped (self->eb, "button-press-event", G_CALLBACK(self_button_cb), self); g_signal_connect_swapped (self->eb, "button-release-event", G_CALLBACK(self_button_cb), self); + g_signal_connect_swapped (self->eb, "motion-notify-event", G_CALLBACK(self_motion_cb), self); } public gboolean scroll_cb (self, GdkEventScroll *event, GtkWidget *w) @@ -88,37 +90,68 @@ protected gboolean button_cb (self, GdkEventButton *b, GtkWidget *widget) { - int y; /* pos */ - int sy; /* size */ + inty; - y = (int)b->y; + y = (int) b->y; /* pos */ if (b->button == 3 || b->button == 2) { if (b->type == GDK_BUTTON_PRESS) { + /* mute */ y = 0; } else { return TRUE; } } else if (b->button == 1) { - sy = widget->allocation.height; - if (sy != 0) { - /* this is a hack 'cause I dont know how to get the height -* of the border of the progressbar yet ;) -*/ - y = (sy + 2 - y) * 100 / sy; - if (y <= 0) y = 0; - } else y = 0; + if (b->type == GDK_BUTTON_PRESS) { + y = self_figure_out_volume(self, widget, y); + self->pressed = TRUE; + } else if (b->type == GDK_BUTTON_RELEASE){ + y = self_figure_out_volume(self, widget, y); + self->pressed = FALSE; + } else { + return TRUE; + } } else { return FALSE; } - - if (y < 0) { y = 0; } - if (y > 100) { y = 100; } self_set_vval (self, y); return TRUE; } + /* returns the volume in range 0..100, given a coordinate in the widget. */ +protected int figure_out_volume(self, GtkWidget *widget, int y) { + int sy; /* size in pixels. */ + sy = widget->allocation.height; /* size */ + if (sy > 4) { + sy -= 4; + /* this is a hack 'cause I dont know how to get the height of the border of the progressbar yet ;) */ + y = (sy + 2 - y) * 100 / sy; + if (y <= 0) + y = 0; + } else { + y = 0; + } + + if (y < 0) { + y = 0; + } else if (y > 100) { + y = 100; + } + return y; +} + + protected gboolean motion_cb (self, GdkEventMotion *m, GtkWidget *widget) + { + if (self->pressed) { + int y = (int) m->y; /* pos */ + y = self_figure_out_volume(self, widget, y); + self_set_vval (self, y); + return TRUE; + } + return FALSE; + } + public XfceMixerControl *new(void) { return XFCE_MIXER_CONTROL(GET_NEW); Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny-private.h === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny-p
[Xfce4-commits] r29182 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2009-01-11 21:44:30 + (Sun, 11 Jan 2009) New Revision: 29182 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny.c Log: fix source indentation. Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob 2009-01-11 21:11:34 UTC (rev 29181) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob 2009-01-11 21:44:30 UTC (rev 29182) @@ -119,7 +119,7 @@ } /* returns the volume in range 0..100, given a coordinate in the widget. */ -protected int figure_out_volume(self, GtkWidget *widget, int y) { + protected int figure_out_volume(self, GtkWidget *widget, int y) { int sy; /* size in pixels. */ sy = widget->allocation.height; /* size */ @@ -139,7 +139,7 @@ y = 100; } return y; -} + } protected gboolean motion_cb (self, GdkEventMotion *m, GtkWidget *widget) { @@ -172,8 +172,8 @@ } override (Xfce:Mixer:Control) void -vcname_changed (Xfce:Mixer:Control *pself (check null type)) -{ + vcname_changed (Xfce:Mixer:Control *pself (check null type)) + { Self *self; char *sanename; PARENT_HANDLER (pself); Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny.c === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny.c 2009-01-11 21:11:34 UTC (rev 29181) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny.c 2009-01-11 21:44:30 UTC (rev 29182) @@ -328,7 +328,7 @@ y = 100; } return y; -}} + }} #line 333 "xfce-mixer-slider-tiny.c" #undef __GOB_FUNCTION__ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29183 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2009-01-11 22:24:56 + (Sun, 11 Jan 2009) New Revision: 29183 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-prefbox.gob xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c Log: fix bug# 3600: Wannabe Master dosn't work properly for multiple instances, bug# 4541: 10 wakeups (speedstep) per seconds. Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-prefbox.gob === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-prefbox.gob 2009-01-11 21:44:30 UTC (rev 29182) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-prefbox.gob 2009-01-11 22:24:56 UTC (rev 29183) @@ -163,6 +163,18 @@ } + protected gboolean focus_out_event_cb(self, GdkEventFocus* event, GtkWidget* widget) + { + /* handle the device change immediately so the Wannabe Master option box will have the new device's entries for sure. */ + if (self->_priv->device_entry_delayer) { /* something was changed. */ + delayer_free(self->_priv->device_entry_delayer); + self->_priv->device_entry_delayer = 0; + emit self_device_changed (self); + } + + return FALSE; + } + init(self) { GtkWidget *dentry; @@ -170,9 +182,12 @@ gtk_box_set_spacing (GTK_BOX (self), 5); self->device_cb = GTK_COMBO (gtk_combo_new ()); + + g_signal_connect_data (G_OBJECT(GTK_COMBO(self->device_cb)->entry), "focus-out-event", G_CALLBACK(self_focus_out_event_cb), self, NULL, G_CONNECT_SWAPPED | G_CONNECT_AFTER); + /* = g_signal_connect_after_swapped (G_OBJECT(GTK_COMBO(self->device_cb)->entry), "focus-out-event", G_CALLBACK(self_focus_out_event_cb), self); */ + self->master_om = GTK_OPTION_MENU (gtk_option_menu_new ()); - gtk_container_set_border_width (GTK_CONTAINER (self), 5); gtk_box_pack_start (GTK_BOX (self), twocol_label (_("Device:"), GTK_WIDGET (self->device_cb)), FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (self), twocol_label (_("Wannabe Master:"), GTK_WIDGET (self->master_om)), FALSE, FALSE, 0); @@ -214,8 +229,8 @@ protected gboolean device_changed_delayed_cb (self) { - /*printf ("delayed\n");*/ emit self_device_changed (self); + self->_priv->device_entry_delayer = 0; return FALSE; } @@ -273,15 +288,7 @@ gtk_entry_set_text (GTK_ENTRY (self->device_cb->entry), nvl (device, "")); - omi = self_find_master_by_name (self, master_control); - gtk_option_menu_set_history (self->master_om, omi); - - if (master_control) { - g_free (master_control); - master_control = NULL; - } - if (device) { g_free (device); device = NULL; @@ -293,6 +300,16 @@ } emit self_device_changed (self); + + omi = self_find_master_by_name (self, master_control); + + gtk_option_menu_set_history (self->master_om, omi); + + if (master_control) { + g_free (master_control); + master_control = NULL; + } + } public void save_preferences (self, XfceMixerPreferences *p) Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h 2009-01-11 21:44:30 UTC (rev 29182) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h 2009-01-11 22:24:56 UTC (rev 29183) @@ -34,6 +34,7 @@ void xfce_mixer_prefbox_fill_master_list (XfceMixerPrefbox * self); gchar *xfce_mixer_prefbox_find_name_by_master_i (XfceMixerPrefbox * self, gint master_i); gint xfce_mixer_prefbox_find_master_by_name (XfceMixerPrefbox * self, gchar const * name); +gboolean xfce_mixer_prefbox_focus_out_event_cb (XfceMixerPrefbox * self, GdkEventFocus * event, GtkWidget * widget); void xfce_mixer_prefbox_add_command_box (XfceMixerPrefbox * self); gboolean xfce_mixer_prefbox_device_changed_delayed_cb (XfceMixerPrefbox * self); void xfce_mixer_prefbox_device_changed_cb(XfceMixerPrefbox * self, GtkEditable * e); Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c 2009-01-11 21:44:30 UTC (rev 29182) +++
[Xfce4-commits] r30153 - pyxfce/trunk/examples/panel/testplugin1
Author: dannym Date: 2009-07-02 21:25:49 + (Thu, 02 Jul 2009) New Revision: 30153 Modified: pyxfce/trunk/examples/panel/testplugin1/testplugin.py Log: add relieflessness to make the panel example look like a normal panel plugin. Modified: pyxfce/trunk/examples/panel/testplugin1/testplugin.py === --- pyxfce/trunk/examples/panel/testplugin1/testplugin.py 2009-07-02 21:14:16 UTC (rev 30152) +++ pyxfce/trunk/examples/panel/testplugin1/testplugin.py 2009-07-02 21:25:49 UTC (rev 30153) @@ -11,6 +11,7 @@ xfce4.panel.Plugin.__init__(self) button1 = gtk.Button("test") + button1.set_relief(gtk.RELIEF_NONE) button1.show() self.add(button1) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30154 - pyxfce/branches/4.4/examples/panel/testplugin1
Author: dannym Date: 2009-07-02 21:26:19 + (Thu, 02 Jul 2009) New Revision: 30154 Modified: pyxfce/branches/4.4/examples/panel/testplugin1/testplugin.py Log: add relieflessness to make the panel example look like a normal panel plugin. Modified: pyxfce/branches/4.4/examples/panel/testplugin1/testplugin.py === --- pyxfce/branches/4.4/examples/panel/testplugin1/testplugin.py 2009-07-02 21:25:49 UTC (rev 30153) +++ pyxfce/branches/4.4/examples/panel/testplugin1/testplugin.py 2009-07-02 21:26:19 UTC (rev 30154) @@ -11,6 +11,7 @@ xfce4.panel.Plugin.__init__(self) button1 = gtk.Button("test") + button1.set_relief(gtk.RELIEF_NONE) button1.show() self.add(button1) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30155 - pyxfce/branches
Author: dannym Date: 2009-07-02 21:27:06 + (Thu, 02 Jul 2009) New Revision: 30155 Added: pyxfce/branches/4.6/ Log: branch for 4.6 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30156 - pyxfce/branches
Author: dannym Date: 2009-07-02 21:28:27 + (Thu, 02 Jul 2009) New Revision: 30156 Removed: pyxfce/branches/4.6/ Log: re-create branch for 4.6 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30157 - pyxfce/branches
Author: dannym Date: 2009-07-02 21:28:55 + (Thu, 02 Jul 2009) New Revision: 30157 Added: pyxfce/branches/4.6/ Log: pyxfce: new 4.6 branch ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30158 - pyxfce/branches/4.6
Author: dannym Date: 2009-07-02 21:33:29 + (Thu, 02 Jul 2009) New Revision: 30158 Removed: pyxfce/branches/4.6/mcs/ Modified: pyxfce/branches/4.6/Makefile.am pyxfce/branches/4.6/configure.ac Log: pyxfce 4.6: get rid of mcs. Modified: pyxfce/branches/4.6/Makefile.am === --- pyxfce/branches/4.6/Makefile.am 2009-07-02 21:28:55 UTC (rev 30157) +++ pyxfce/branches/4.6/Makefile.am 2009-07-02 21:33:29 UTC (rev 30158) @@ -13,8 +13,8 @@ SUBDIR_MIGHTY_MOUSE = panel endif -SUBDIRS = gui mcs netk util $(SUBDIR_MIGHTY_MOUSE) -DIST_SUBDIRS = gui mcs netk util $(SUBDIR_MIGHTY_MOUSE) +SUBDIRS = gui netk util $(SUBDIR_MIGHTY_MOUSE) +DIST_SUBDIRS = gui netk util $(SUBDIR_MIGHTY_MOUSE) PLATFORM_VERSION = 4.2 PLATFORM_WIN32 = Modified: pyxfce/branches/4.6/configure.ac === --- pyxfce/branches/4.6/configure.ac2009-07-02 21:28:55 UTC (rev 30157) +++ pyxfce/branches/4.6/configure.ac2009-07-02 21:33:29 UTC (rev 30158) @@ -57,8 +57,6 @@ dnl PANEL_EXTERNALPLUGINDIR dnl PANEL_DESKTOPDATADIR -BM_DEPEND([XFCE4_MCS_CLIENT], [libxfce4mcs-client-1.0], [4.1.0]) -BM_DEPEND([XFCE4_MCS_MANAGER], [libxfce4mcs-manager-1.0], [4.1.0]) BM_DEPEND([GTK], [gtk+-2.0], [2.4]) BM_DEPEND([PYGTK], [pygtk-2.0], [2.6.0]) @@ -86,7 +84,6 @@ Makefile pyxfce-1.0.pc gui/Makefile - mcs/Makefile netk/Makefile panel/Makefile util/Makefile ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30159 - in pyxfce/branches/4.6: gui netk util
Author: dannym Date: 2009-07-02 21:34:58 + (Thu, 02 Jul 2009) New Revision: 30159 Modified: pyxfce/branches/4.6/gui/menubutton.defs pyxfce/branches/4.6/netk/util.defs pyxfce/branches/4.6/netk/window_menu.defs pyxfce/branches/4.6/util/desktopentry.defs pyxfce/branches/4.6/util/kiosk.defs pyxfce/branches/4.6/util/utf8.defs Log: commit trivial (comment only) changes Modified: pyxfce/branches/4.6/gui/menubutton.defs === --- pyxfce/branches/4.6/gui/menubutton.defs 2009-07-02 21:33:29 UTC (rev 30158) +++ pyxfce/branches/4.6/gui/menubutton.defs 2009-07-02 21:34:58 UTC (rev 30159) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_menubutton.h +;; From xfce_menubutton.h (define-function menubutton_get_type (c-name "xfce_menubutton_get_type") Modified: pyxfce/branches/4.6/netk/util.defs === --- pyxfce/branches/4.6/netk/util.defs 2009-07-02 21:33:29 UTC (rev 30158) +++ pyxfce/branches/4.6/netk/util.defs 2009-07-02 21:34:58 UTC (rev 30159) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-util.h +;; From netk-util.h (define-function gtk_window_set_type (c-name "netk_gtk_window_set_type") Modified: pyxfce/branches/4.6/netk/window_menu.defs === --- pyxfce/branches/4.6/netk/window_menu.defs 2009-07-02 21:33:29 UTC (rev 30158) +++ pyxfce/branches/4.6/netk/window_menu.defs 2009-07-02 21:34:58 UTC (rev 30159) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-window-menu.h +;; From netk-window-menu.h (define-function create_window_menu (c-name "netk_create_window_menu") Modified: pyxfce/branches/4.6/util/desktopentry.defs === --- pyxfce/branches/4.6/util/desktopentry.defs 2009-07-02 21:33:29 UTC (rev 30158) +++ pyxfce/branches/4.6/util/desktopentry.defs 2009-07-02 21:34:58 UTC (rev 30159) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-desktopentry.h +;; From xfce-desktopentry.h (define-function desktop_entry_get_type (c-name "xfce_desktop_entry_get_type") Modified: pyxfce/branches/4.6/util/kiosk.defs === --- pyxfce/branches/4.6/util/kiosk.defs 2009-07-02 21:33:29 UTC (rev 30158) +++ pyxfce/branches/4.6/util/kiosk.defs 2009-07-02 21:34:58 UTC (rev 30159) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-kiosk.h +;; From xfce-kiosk.h (define-function kiosk_new (c-name "xfce_kiosk_new") Modified: pyxfce/branches/4.6/util/utf8.defs === --- pyxfce/branches/4.6/util/utf8.defs 2009-07-02 21:33:29 UTC (rev 30158) +++ pyxfce/branches/4.6/util/utf8.defs 2009-07-02 21:34:58 UTC (rev 30159) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-utf8.h +;; From xfce-utf8.h (define-function utf8_remove_controls (c-name "xfce_utf8_remove_controls") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30160 - in pyxfce/branches/4.6: gui netk panel util
Author: dannym Date: 2009-07-02 21:36:30 + (Thu, 02 Jul 2009) New Revision: 30160 Modified: pyxfce/branches/4.6/gui/aboutdialog.defs pyxfce/branches/4.6/netk/enum_types.defs pyxfce/branches/4.6/netk/window_action_menu.defs pyxfce/branches/4.6/netk/workspace.defs pyxfce/branches/4.6/panel/enums.defs pyxfce/branches/4.6/util/fileutils.defs pyxfce/branches/4.6/util/i18n.defs pyxfce/branches/4.6/util/resource.defs Log: commit trivial (comment only) changes Modified: pyxfce/branches/4.6/gui/aboutdialog.defs === --- pyxfce/branches/4.6/gui/aboutdialog.defs2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/gui/aboutdialog.defs2009-07-02 21:36:30 UTC (rev 30160) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_aboutdialog.h +;; From xfce_aboutdialog.h (define-function about_info_get_type (c-name "xfce_about_info_get_type") Modified: pyxfce/branches/4.6/netk/enum_types.defs === --- pyxfce/branches/4.6/netk/enum_types.defs2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/netk/enum_types.defs2009-07-02 21:36:30 UTC (rev 30160) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-enum-types.h +;; From netk-enum-types.h (define-function window_state_get_type (c-name "netk_window_state_get_type") Modified: pyxfce/branches/4.6/netk/window_action_menu.defs === --- pyxfce/branches/4.6/netk/window_action_menu.defs2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/netk/window_action_menu.defs2009-07-02 21:36:30 UTC (rev 30160) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-window-action-menu.h +;; From netk-window-action-menu.h (define-function create_window_action_menu (c-name "netk_create_window_action_menu") Modified: pyxfce/branches/4.6/netk/workspace.defs === --- pyxfce/branches/4.6/netk/workspace.defs 2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/netk/workspace.defs 2009-07-02 21:36:30 UTC (rev 30160) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-workspace.h +;; From netk-workspace.h (define-function workspace_get_type (c-name "netk_workspace_get_type") Modified: pyxfce/branches/4.6/panel/enums.defs === --- pyxfce/branches/4.6/panel/enums.defs2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/panel/enums.defs2009-07-02 21:36:30 UTC (rev 30160) @@ -26,6 +26,6 @@ ) -;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-enums.h +;; From xfce-panel-enums.h Modified: pyxfce/branches/4.6/util/fileutils.defs === --- pyxfce/branches/4.6/util/fileutils.defs 2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/util/fileutils.defs 2009-07-02 21:36:30 UTC (rev 30160) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-fileutils.h +;; From xfce-fileutils.h (define-function mkdirhier (c-name "xfce_mkdirhier") Modified: pyxfce/branches/4.6/util/i18n.defs === --- pyxfce/branches/4.6/util/i18n.defs 2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/util/i18n.defs 2009-07-02 21:36:30 UTC (rev 30160) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-i18n.h +;; From xfce-i18n.h (define-function textdomain (c-name "xfce_textdomain") Modified: pyxfce/branches/4.6/util/resource.defs === --- pyxfce/branches/4.6/util/resource.defs 2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/util/resource.defs 2009-07-02 21:36:30 UTC (rev 30160) @@ -16,7 +16,7 @@ ) -;; From /usr/local/include/xfce4/libxfce4util/xfce-resource.h +;; From xfce-resource.h (define-function resource_dirs (c-name "xfce_resource_dirs") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30161 - in pyxfce/branches/4.6: gui netk panel util
Author: dannym Date: 2009-07-02 21:39:02 + (Thu, 02 Jul 2009) New Revision: 30161 Modified: pyxfce/branches/4.6/gui/colorbutton.defs pyxfce/branches/4.6/gui/decortoggle.defs pyxfce/branches/4.6/gui/filechooser.defs pyxfce/branches/4.6/gui/gtk_extensions.defs pyxfce/branches/4.6/gui/icontheme.defs pyxfce/branches/4.6/netk/application.defs pyxfce/branches/4.6/netk/class_group.defs pyxfce/branches/4.6/panel/window.defs pyxfce/branches/4.6/util/rc.defs Log: commit trivial (comment only) changes Modified: pyxfce/branches/4.6/gui/colorbutton.defs === --- pyxfce/branches/4.6/gui/colorbutton.defs2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/gui/colorbutton.defs2009-07-02 21:39:02 UTC (rev 30161) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-colorbutton.h +;; From xfce-colorbutton.h (define-function color_button_new (c-name "xfce_color_button_new") Modified: pyxfce/branches/4.6/gui/decortoggle.defs === --- pyxfce/branches/4.6/gui/decortoggle.defs2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/gui/decortoggle.defs2009-07-02 21:39:02 UTC (rev 30161) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_decortoggle.h +;; From xfce_decortoggle.h (define-function decortoggle_get_type (c-name "xfce_decortoggle_get_type") Modified: pyxfce/branches/4.6/gui/filechooser.defs === --- pyxfce/branches/4.6/gui/filechooser.defs2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/gui/filechooser.defs2009-07-02 21:39:02 UTC (rev 30161) @@ -15,7 +15,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/xfce-filechooser.h +;; From xfce-filechooser.h (define-function file_chooser_new (c-name "xfce_file_chooser_new") Modified: pyxfce/branches/4.6/gui/gtk_extensions.defs === --- pyxfce/branches/4.6/gui/gtk_extensions.defs 2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/gui/gtk_extensions.defs 2009-07-02 21:39:02 UTC (rev 30161) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-gtk-extensions.h +;; From xfce-gtk-extensions.h (define-function gtk_window_center_on_monitor (c-name "xfce_gtk_window_center_on_monitor") Modified: pyxfce/branches/4.6/gui/icontheme.defs === --- pyxfce/branches/4.6/gui/icontheme.defs 2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/gui/icontheme.defs 2009-07-02 21:39:02 UTC (rev 30161) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-icontheme.h +;; From xfce-icontheme.h (define-function icon_theme_get_type (c-name "xfce_icon_theme_get_type") Modified: pyxfce/branches/4.6/netk/application.defs === --- pyxfce/branches/4.6/netk/application.defs 2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/netk/application.defs 2009-07-02 21:39:02 UTC (rev 30161) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-application.h +;; From netk-application.h (define-function application_get_type (c-name "netk_application_get_type") Modified: pyxfce/branches/4.6/netk/class_group.defs === --- pyxfce/branches/4.6/netk/class_group.defs 2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/netk/class_group.defs 2009-07-02 21:39:02 UTC (rev 30161) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-class-group.h +;; From netk-class-group.h (define-function class_group_get_type (c-name "netk_class_group_get_type") Modified: pyxfce/branches/4.6/panel/window.defs === --- pyxfce/branches/4.6/panel/window.defs 2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/panel/window.defs 2009-07-02 21:39:02 UTC (rev 30161) @@ -22,7 +22,7 @@ ) -;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-window.h +;; From xfce-panel-window.h (define-function xfce_panel_window_get_type (c-name "xfce_panel_window_get_type") Modified: pyxfce/branches/4.6/util/rc.defs === --- pyxfce/branches/4.6/util/rc.defs2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/util/rc.defs2009-07-02 21:39:02 UTC (rev 30161) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-rc.h +;; From xfc
[Xfce4-commits] r30162 - in pyxfce/branches/4.6: gui netk panel util
Author: dannym Date: 2009-07-02 21:39:49 + (Thu, 02 Jul 2009) New Revision: 30162 Modified: pyxfce/branches/4.6/gui/gen pyxfce/branches/4.6/netk/gen pyxfce/branches/4.6/panel/gen pyxfce/branches/4.6/util/gen Log: fix path for new 2.6 pygtk codegen Modified: pyxfce/branches/4.6/gui/gen === --- pyxfce/branches/4.6/gui/gen 2009-07-02 21:39:02 UTC (rev 30161) +++ pyxfce/branches/4.6/gui/gen 2009-07-02 21:39:49 UTC (rev 30162) @@ -12,7 +12,8 @@ then defs="${t/-/_}.defs" defs="${defs/-/_}" - python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}" + python /usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}" + #python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}" fi done rm -f util.defs Modified: pyxfce/branches/4.6/netk/gen === --- pyxfce/branches/4.6/netk/gen2009-07-02 21:39:02 UTC (rev 30161) +++ pyxfce/branches/4.6/netk/gen2009-07-02 21:39:49 UTC (rev 30162) @@ -16,8 +16,8 @@ defs="${defs/-/_}" #echo "${defs}" - - python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}" + python /usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}" + #python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}" fi done rm -f util.defs Modified: pyxfce/branches/4.6/panel/gen === --- pyxfce/branches/4.6/panel/gen 2009-07-02 21:39:02 UTC (rev 30161) +++ pyxfce/branches/4.6/panel/gen 2009-07-02 21:39:49 UTC (rev 30162) @@ -19,7 +19,8 @@ [ "${defs}" = "internal_plugin.defs" ] && continue [ "${defs}" = "plugin.defs" ] && continue - python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}" + python /usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}" + #python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}" fi done Modified: pyxfce/branches/4.6/util/gen === --- pyxfce/branches/4.6/util/gen2009-07-02 21:39:02 UTC (rev 30161) +++ pyxfce/branches/4.6/util/gen2009-07-02 21:39:49 UTC (rev 30162) @@ -9,7 +9,8 @@ t="${t%.h}" defs="${t}.defs" - python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}" + python /usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}" + #python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}" done rm -f util.defs ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30163 - in pyxfce/branches/4.6: gui panel util
Author: dannym Date: 2009-07-02 21:41:35 + (Thu, 02 Jul 2009) New Revision: 30163 Modified: pyxfce/branches/4.6/gui/framebox.defs pyxfce/branches/4.6/gui/gtk_style.defs pyxfce/branches/4.6/gui/togglebutton.defs pyxfce/branches/4.6/panel/arrow_button.defs pyxfce/branches/4.6/util/miscutils.defs Log: commit trivial (comment only) changes Modified: pyxfce/branches/4.6/gui/framebox.defs === --- pyxfce/branches/4.6/gui/framebox.defs 2009-07-02 21:39:49 UTC (rev 30162) +++ pyxfce/branches/4.6/gui/framebox.defs 2009-07-02 21:41:35 UTC (rev 30163) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_framebox.h +;; From xfce_framebox.h (define-function framebox_get_type (c-name "xfce_framebox_get_type") Modified: pyxfce/branches/4.6/gui/gtk_style.defs === --- pyxfce/branches/4.6/gui/gtk_style.defs 2009-07-02 21:39:49 UTC (rev 30162) +++ pyxfce/branches/4.6/gui/gtk_style.defs 2009-07-02 21:41:35 UTC (rev 30163) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/gtk_style.h +;; From gtk_style.h (define-function get_style (c-name "get_style") Modified: pyxfce/branches/4.6/gui/togglebutton.defs === --- pyxfce/branches/4.6/gui/togglebutton.defs 2009-07-02 21:39:49 UTC (rev 30162) +++ pyxfce/branches/4.6/gui/togglebutton.defs 2009-07-02 21:41:35 UTC (rev 30163) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_togglebutton.h +;; From xfce_togglebutton.h (define-function togglebutton_get_type (c-name "xfce_togglebutton_get_type") Modified: pyxfce/branches/4.6/panel/arrow_button.defs === --- pyxfce/branches/4.6/panel/arrow_button.defs 2009-07-02 21:39:49 UTC (rev 30162) +++ pyxfce/branches/4.6/panel/arrow_button.defs 2009-07-02 21:41:35 UTC (rev 30163) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4panel/xfce-arrow-button.h +;; From xfce-arrow-button.h (define-function xfce_arrow_button_get_type (c-name "xfce_arrow_button_get_type") Modified: pyxfce/branches/4.6/util/miscutils.defs === --- pyxfce/branches/4.6/util/miscutils.defs 2009-07-02 21:39:49 UTC (rev 30162) +++ pyxfce/branches/4.6/util/miscutils.defs 2009-07-02 21:41:35 UTC (rev 30163) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-miscutils.h +;; From xfce-miscutils.h (define-function version_string (c-name "xfce_version_string") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30164 - pyxfce/branches/4.6/gui
Author: dannym Date: 2009-07-02 21:43:50 + (Thu, 02 Jul 2009) New Revision: 30164 Modified: pyxfce/branches/4.6/gui/decorbutton.defs pyxfce/branches/4.6/gui/dialogs.defs pyxfce/branches/4.6/gui/gdk_extensions.defs pyxfce/branches/4.6/gui/gtktoxevent.defs pyxfce/branches/4.6/gui/iconbutton.defs pyxfce/branches/4.6/gui/libxfcegui4.defs pyxfce/branches/4.6/gui/libxfcegui4_config.defs pyxfce/branches/4.6/gui/movehandler.defs pyxfce/branches/4.6/gui/scaled_image.defs pyxfce/branches/4.6/gui/systemtray.defs pyxfce/branches/4.6/gui/titled_dialog.defs Log: commit trivial (comment only) changes Modified: pyxfce/branches/4.6/gui/decorbutton.defs === --- pyxfce/branches/4.6/gui/decorbutton.defs2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/decorbutton.defs2009-07-02 21:43:50 UTC (rev 30164) @@ -20,7 +20,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/xfce_decorbutton.h +;; From xfce_decorbutton.h (define-function decorbutton_get_type (c-name "xfce_decorbutton_get_type") Modified: pyxfce/branches/4.6/gui/dialogs.defs === --- pyxfce/branches/4.6/gui/dialogs.defs2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/dialogs.defs2009-07-02 21:43:50 UTC (rev 30164) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/dialogs.h +;; From dialogs.h (define-function show_info (c-name "show_info") Modified: pyxfce/branches/4.6/gui/gdk_extensions.defs === --- pyxfce/branches/4.6/gui/gdk_extensions.defs 2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/gdk_extensions.defs 2009-07-02 21:43:50 UTC (rev 30164) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-gdk-extensions.h +;; From xfce-gdk-extensions.h (define-function gdk_display_get_fullname (c-name "xfce_gdk_display_get_fullname") Modified: pyxfce/branches/4.6/gui/gtktoxevent.defs === --- pyxfce/branches/4.6/gui/gtktoxevent.defs2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/gtktoxevent.defs2009-07-02 21:43:50 UTC (rev 30164) @@ -13,7 +13,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/gtktoxevent.h +;; From gtktoxevent.h (define-function push_event_filter (c-name "xfce_push_event_filter") Modified: pyxfce/branches/4.6/gui/iconbutton.defs === --- pyxfce/branches/4.6/gui/iconbutton.defs 2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/iconbutton.defs 2009-07-02 21:43:50 UTC (rev 30164) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_iconbutton.h +;; From xfce_iconbutton.h (define-function iconbutton_get_type (c-name "xfce_iconbutton_get_type") Modified: pyxfce/branches/4.6/gui/libxfcegui4.defs === --- pyxfce/branches/4.6/gui/libxfcegui4.defs2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/libxfcegui4.defs2009-07-02 21:43:50 UTC (rev 30164) @@ -3,6 +3,6 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/libxfcegui4.h +;; From libxfcegui4.h Modified: pyxfce/branches/4.6/gui/libxfcegui4_config.defs === --- pyxfce/branches/4.6/gui/libxfcegui4_config.defs 2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/libxfcegui4_config.defs 2009-07-02 21:43:50 UTC (rev 30164) @@ -3,6 +3,6 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/libxfcegui4-config.h +;; From libxfcegui4-config.h Modified: pyxfce/branches/4.6/gui/movehandler.defs === --- pyxfce/branches/4.6/gui/movehandler.defs2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/movehandler.defs2009-07-02 21:43:50 UTC (rev 30164) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_movehandler.h +;; From xfce_movehandler.h (define-function void (c-name "void") Modified: pyxfce/branches/4.6/gui/scaled_image.defs === --- pyxfce/branches/4.6/gui/scaled_image.defs 2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/scaled_image.defs 2009-07-02 21:43:50 UTC (rev 30164) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_scaled_image.h +;; From xfce_scaled_image.h (define-function scaled_image_get_type (c-name "xfce_scaled_image_get_type")
[Xfce4-commits] r30165 - pyxfce/branches/4.6/gui
Author: dannym Date: 2009-07-02 21:45:36 + (Thu, 02 Jul 2009) New Revision: 30165 Modified: pyxfce/branches/4.6/gui/clock.defs Log: pyxfce 4.6: clock: add: set_format, set_formatted_view, get_formatted_view. Modified: pyxfce/branches/4.6/gui/clock.defs === --- pyxfce/branches/4.6/gui/clock.defs 2009-07-02 21:43:50 UTC (rev 30164) +++ pyxfce/branches/4.6/gui/clock.defs 2009-07-02 21:45:36 UTC (rev 30165) @@ -33,7 +33,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/xfce_clock.h +;; From xfce_clock.h (define-function clock_get_type (c-name "xfce_clock_get_type") @@ -166,6 +166,30 @@ (return-type "none") ) +(define-method set_format + (of-object "XfceClock") + (c-name "xfce_clock_set_format") + (return-type "none") + (parameters +'("const-gchar*" "format") + ) +) + +(define-method set_formatted_view + (of-object "XfceClock") + (c-name "xfce_clock_set_formatted_view") + (return-type "none") + (parameters +'("gboolean" "formatted") + ) +) + +(define-method get_formatted_view + (of-object "XfceClock") + (c-name "xfce_clock_get_formatted_view") + (return-type "gboolean") +) + (define-method get_mode (of-object "XfceClock") (c-name "xfce_clock_get_mode") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30166 - pyxfce/branches/4.6/gui
Author: dannym Date: 2009-07-02 21:46:22 + (Thu, 02 Jul 2009) New Revision: 30166 Modified: pyxfce/branches/4.6/gui/icons.defs Log: pyxfce 4.6: clock: add: 'icon-category-accessories' Modified: pyxfce/branches/4.6/gui/icons.defs === --- pyxfce/branches/4.6/gui/icons.defs 2009-07-02 21:45:36 UTC (rev 30165) +++ pyxfce/branches/4.6/gui/icons.defs 2009-07-02 21:46:22 UTC (rev 30166) @@ -18,18 +18,20 @@ '("icon-category-graphics" "XFCE_ICON_CATEGORY_GRAPHICS") '("icon-category-printer" "XFCE_ICON_CATEGORY_PRINTER") '("icon-category-productivity" "XFCE_ICON_CATEGORY_PRODUCTIVITY") +'("icon-category-office" "XFCE_ICON_CATEGORY_OFFICE") '("icon-category-sound" "XFCE_ICON_CATEGORY_SOUND") '("icon-category-terminal" "XFCE_ICON_CATEGORY_TERMINAL") '("icon-category-development" "XFCE_ICON_CATEGORY_DEVELOPMENT") '("icon-category-settings" "XFCE_ICON_CATEGORY_SETTINGS") '("icon-category-system" "XFCE_ICON_CATEGORY_SYSTEM") '("icon-category-wine" "XFCE_ICON_CATEGORY_WINE") +'("icon-category-accessories" "XFCE_ICON_CATEGORY_ACCESSORIES") '("n-builtin-icon-categories" "XFCE_N_BUILTIN_ICON_CATEGORIES") ) ) -;; From /usr/local/include/xfce4/libxfcegui4/icons.h +;; From icons.h (define-function inline_icon_at_size (c-name "xfce_inline_icon_at_size") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30167 - pyxfce/branches/4.6/panel
Author: dannym Date: 2009-07-02 21:50:02 + (Thu, 02 Jul 2009) New Revision: 30167 Modified: pyxfce/branches/4.6/panel/external_plugin.defs Log: pyxfce 4.6: 'panel/panel/external_plugin.defs': commit trivial changes. Modified: pyxfce/branches/4.6/panel/external_plugin.defs === --- pyxfce/branches/4.6/panel/external_plugin.defs 2009-07-02 21:46:22 UTC (rev 30166) +++ pyxfce/branches/4.6/panel/external_plugin.defs 2009-07-02 21:50:02 UTC (rev 30167) @@ -12,7 +12,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-external-plugin.h +;; From xfce-panel-external-plugin.h (define-function xfce_external_panel_plugin_get_type (c-name "xfce_external_panel_plugin_get_type") @@ -24,8 +24,8 @@ (is-constructor-of "XfceExternalPanelPlugin") (return-type "GtkWidget*") (parameters -'("int" "argc") -'("char**" "argv") +'("gint" "argc") +'("gchar**" "argv") '("XfcePanelPluginFunc" "construct") ) ) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30168 - pyxfce/branches/4.6
Author: dannym Date: 2009-07-02 21:51:38 + (Thu, 02 Jul 2009) New Revision: 30168 Modified: pyxfce/branches/4.6/ChangeLog Log: pyxfce 4.6: update 'ChangeLog' Modified: pyxfce/branches/4.6/ChangeLog === --- pyxfce/branches/4.6/ChangeLog 2009-07-02 21:50:02 UTC (rev 30167) +++ pyxfce/branches/4.6/ChangeLog 2009-07-02 21:51:38 UTC (rev 30168) @@ -1,3 +1,7 @@ +2009-07-03 00:49 dannym + + * support Xfce 4.6. + 2006-03-25 16:16 dannym * COPYING: swich e-mairl now that it works :) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30170 - pyxfce/branches/4.6/netk
Author: dannym Date: 2009-07-02 21:58:45 + (Thu, 02 Jul 2009) New Revision: 30170 Modified: pyxfce/branches/4.6/netk/pager.defs Log: netk/pager: add 'set_workspace_scrolling' Modified: pyxfce/branches/4.6/netk/pager.defs === --- pyxfce/branches/4.6/netk/pager.defs 2009-07-02 21:54:51 UTC (rev 30169) +++ pyxfce/branches/4.6/netk/pager.defs 2009-07-02 21:58:45 UTC (rev 30170) @@ -20,7 +20,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/netk-pager.h +;; From netk-pager.h (define-function pager_get_type (c-name "netk_pager_get_type") @@ -81,6 +81,15 @@ ) ) +(define-method set_workspace_scrolling + (of-object "NetkPager") + (c-name "netk_pager_set_workspace_scrolling") + (return-type "none") + (parameters +'("gboolean" "workspace_scrolling") + ) +) + (define-method set_shadow_type (of-object "NetkPager") (c-name "netk_pager_set_shadow_type") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30169 - pyxfce/branches/4.6
Author: dannym Date: 2009-07-02 21:54:51 + (Thu, 02 Jul 2009) New Revision: 30169 Modified: pyxfce/branches/4.6/configure.ac Log: pyxfce 4.6: update required Xfce version Modified: pyxfce/branches/4.6/configure.ac === --- pyxfce/branches/4.6/configure.ac2009-07-02 21:51:38 UTC (rev 30168) +++ pyxfce/branches/4.6/configure.ac2009-07-02 21:54:51 UTC (rev 30169) @@ -4,11 +4,11 @@ ACLOCAL_AMFLAGS = -I m4 m4_define(pyxfce_major_version, 4) -m4_define(pyxfce_minor_version, 4) +m4_define(pyxfce_minor_version, 6) m4_define(pyxfce_micro_version, 0) m4_define(pyxfce_version, pyxfce_major_version.pyxfce_minor_version.pyxfce_micro_version) -m4_define(xfce_required_version, 4.4.0) +m4_define(xfce_required_version, 4.6.0) AC_INIT(pyxfce, pyxfce_version, []) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30172 - pyxfce/branches/4.6/netk
Author: dannym Date: 2009-07-02 22:24:06 + (Thu, 02 Jul 2009) New Revision: 30172 Modified: pyxfce/branches/4.6/netk/gen Log: pyxfce 4.6: netk: simplify 'gen'. Modified: pyxfce/branches/4.6/netk/gen === --- pyxfce/branches/4.6/netk/gen2009-07-02 22:23:29 UTC (rev 30171) +++ pyxfce/branches/4.6/netk/gen2009-07-02 22:24:06 UTC (rev 30172) @@ -64,16 +64,16 @@ # message_new # message_cancel -cat trayicon.defs \ -| awk ' /^\(define-/ { n = 0; } /^\(define-function tray_icon_new/ { n = 1; } /^\)/ { n = 0; } /\(parameters/ { if (n) skip1 = 1; } /\("Screen\*" "screen"\)/ { if (n) skip1 = 1; } / \)/ { if (n) skip1 = 1; } // { if (skip1 == 1) skip1 = 0; else print $_; } ' >trayicon.defs.new \ -&& mv trayicon.defs.new trayicon.defs +#cat trayicon.defs \ +#| awk ' /^\(define-/ { n = 0; } /^\(define-function tray_icon_new/ { n = 1; } /^\)/ { n = 0; } /\(parameters/ { if (n) skip1 = 1; } /\("Screen\*" "screen"\)/ { if (n) skip1 = 1; } / \)/ { if (n) skip1 = 1; } // { if (skip1 == 1) skip1 = 0; else print $_; } ' >trayicon.defs.new \ +#&& mv trayicon.defs.new trayicon.defs -cat >> screen.defs << EOF -(define-method get_workspaces - (of-object "NetkScreen") - (c-name "netk_screen_get_workspaces") - (return-type "GList*") - (parameters - ) -) -EOF +#cat >> screen.defs << EOF +#(define-method get_workspaces +# (of-object "NetkScreen") +# (c-name "netk_screen_get_workspaces") +# (return-type "GList*") +# (parameters +# ) +#) +#EOF ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30173 - pyxfce/branches/4.6/netk
Author: dannym Date: 2009-07-02 22:25:47 + (Thu, 02 Jul 2009) New Revision: 30173 Modified: pyxfce/branches/4.6/netk/tasklist.defs Log: pyxfce 4.6 netk/tasklist: add 'set_button_relief', 'get_screen', 'get_grouping', 'get_switch_workspace_on_unminimize', 'get_grouping_limit', 'get_include_all_workspaces', 'get_show_label', 'get_button_relief'. Modified: pyxfce/branches/4.6/netk/tasklist.defs === --- pyxfce/branches/4.6/netk/tasklist.defs 2009-07-02 22:24:06 UTC (rev 30172) +++ pyxfce/branches/4.6/netk/tasklist.defs 2009-07-02 22:25:47 UTC (rev 30173) @@ -21,7 +21,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/netk-tasklist.h +;; From netk-tasklist.h (define-function tasklist_get_type (c-name "netk_tasklist_get_type") @@ -141,4 +141,55 @@ ) ) +(define-method set_button_relief + (of-object "NetkTasklist") + (c-name "netk_tasklist_set_button_relief") + (return-type "none") + (parameters +'("GtkReliefStyle" "relief") + ) +) +(define-method get_screen + (of-object "NetkTasklist") + (c-name "netk_tasklist_get_screen") + (return-type "NetkScreen*") +) + +(define-method get_grouping + (of-object "NetkTasklist") + (c-name "netk_tasklist_get_grouping") + (return-type "NetkTasklistGroupingType") +) + +(define-method get_switch_workspace_on_unminimize + (of-object "NetkTasklist") + (c-name "netk_tasklist_get_switch_workspace_on_unminimize") + (return-type "gboolean") +) + +(define-method get_grouping_limit + (of-object "NetkTasklist") + (c-name "netk_tasklist_get_grouping_limit") + (return-type "gint") +) + +(define-method get_include_all_workspaces + (of-object "NetkTasklist") + (c-name "netk_tasklist_get_include_all_workspaces") + (return-type "gboolean") +) + +(define-method get_show_label + (of-object "NetkTasklist") + (c-name "netk_tasklist_get_show_label") + (return-type "gboolean") +) + +(define-method get_button_relief + (of-object "NetkTasklist") + (c-name "netk_tasklist_get_button_relief") + (return-type "GtkReliefStyle") +) + + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30174 - pyxfce/branches/4.6/netk
Author: dannym Date: 2009-07-02 22:26:57 + (Thu, 02 Jul 2009) New Revision: 30174 Modified: pyxfce/branches/4.6/netk/screen.defs Log: pyxfce 4.6: netk/screen: minimal changes. Modified: pyxfce/branches/4.6/netk/screen.defs === --- pyxfce/branches/4.6/netk/screen.defs2009-07-02 22:25:47 UTC (rev 30173) +++ pyxfce/branches/4.6/netk/screen.defs2009-07-02 22:26:57 UTC (rev 30174) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-screen.h +;; From netk-screen.h (define-function screen_get_type (c-name "netk_screen_get_type") @@ -77,6 +77,12 @@ (return-type "GList*") ) +(define-method get_workspaces + (of-object "NetkScreen") + (c-name "netk_screen_get_workspaces") + (return-type "GList*") +) + (define-method force_update (of-object "NetkScreen") (c-name "netk_screen_force_update") @@ -171,10 +177,3 @@ ) -(define-method get_workspaces - (of-object "NetkScreen") - (c-name "netk_screen_get_workspaces") - (return-type "GList*") - (parameters - ) -) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30175 - pyxfce/branches/4.6/netk
Author: dannym Date: 2009-07-02 22:28:12 + (Thu, 02 Jul 2009) New Revision: 30175 Modified: pyxfce/branches/4.6/netk/window.defs Log: pyxfce 4.6: netk/window: add 'demands-attention', 'or_transient_demands_attention', 'set_fullscreen', 'get_icon_geometry'. Modified: pyxfce/branches/4.6/netk/window.defs === --- pyxfce/branches/4.6/netk/window.defs2009-07-02 22:26:57 UTC (rev 30174) +++ pyxfce/branches/4.6/netk/window.defs2009-07-02 22:28:12 UTC (rev 30175) @@ -24,6 +24,7 @@ '("hidden" "NETK_WINDOW_STATE_HIDDEN") '("fullscreen" "NETK_WINDOW_STATE_FULLSCREEN") '("urgent" "NETK_WINDOW_STATE_URGENT") +'("demands-attention" "NETK_WINDOW_STATE_DEMANDS_ATTENTION") ) ) @@ -69,7 +70,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/netk-window.h +;; From netk-window.h (define-function window_get_type (c-name "netk_window_get_type") @@ -216,6 +217,24 @@ (return-type "gboolean") ) +(define-method is_fullscreen + (of-object "NetkWindow") + (c-name "netk_window_is_fullscreen") + (return-type "gboolean") +) + +(define-method demands_attention + (of-object "NetkWindow") + (c-name "netk_window_demands_attention") + (return-type "gboolean") +) + +(define-method or_transient_demands_attention + (of-object "NetkWindow") + (c-name "netk_window_or_transient_demands_attention") + (return-type "gboolean") +) + (define-method set_skip_pager (of-object "NetkWindow") (c-name "netk_window_set_skip_pager") @@ -234,6 +253,15 @@ ) ) +(define-method set_fullscreen + (of-object "NetkWindow") + (c-name "netk_window_set_fullscreen") + (return-type "none") + (parameters +'("gboolean" "fullscreen") + ) +) + (define-method close (of-object "NetkWindow") (c-name "netk_window_close") @@ -405,6 +433,18 @@ ) ) +(define-method get_icon_geometry + (of-object "NetkWindow") + (c-name "netk_window_get_icon_geometry") + (return-type "gboolean") + (parameters +'("int*" "xp") +'("int*" "yp") +'("int*" "widthp") +'("int*" "heightp") + ) +) + (define-method get_actions (of-object "NetkWindow") (c-name "netk_window_get_actions") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30177 - pyxfce/branches/4.6/gui
Author: dannym Date: 2009-07-02 22:30:40 + (Thu, 02 Jul 2009) New Revision: 30177 Modified: pyxfce/branches/4.6/gui/appmenuitem.defs Log: pyxfce 4.6: gui/appmenuitem: add 'app_menu_item_set_icon_theme_name'. Modified: pyxfce/branches/4.6/gui/appmenuitem.defs === --- pyxfce/branches/4.6/gui/appmenuitem.defs2009-07-02 22:29:54 UTC (rev 30176) +++ pyxfce/branches/4.6/gui/appmenuitem.defs2009-07-02 22:30:40 UTC (rev 30177) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-appmenuitem.h +;; From xfce-appmenuitem.h (define-function app_menu_item_get_type (c-name "xfce_app_menu_item_get_type") @@ -148,19 +148,19 @@ (return-type "gboolean") ) -(define-function app_menu_item_set_icon_size - (c-name "xfce_app_menu_item_set_icon_size") +(define-function app_menu_item_set_icon_theme_name + (c-name "xfce_app_menu_item_set_icon_theme_name") (return-type "none") (parameters -'("guint" "icon_size") +'("const-gchar*" "theme_name") ) ) -(define-function app_menu_item_set_icon_theme_name - (c-name "xfce_app_menu_item_set_icon_theme_name") +(define-function app_menu_item_set_icon_size + (c-name "xfce_app_menu_item_set_icon_size") (return-type "none") (parameters -'("const-gchar*" "theme_name") +'("guint" "icon_size") ) ) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30178 - in pyxfce/branches/4.6: . menu
Author: dannym Date: 2009-07-02 22:35:48 + (Thu, 02 Jul 2009) New Revision: 30178 Added: pyxfce/branches/4.6/menu/ pyxfce/branches/4.6/menu/Makefile.am pyxfce/branches/4.6/menu/gen pyxfce/branches/4.6/menu/libxfce4menu.defs pyxfce/branches/4.6/menu/libxfce4menu_config.defs pyxfce/branches/4.6/menu/menumodule.c pyxfce/branches/4.6/menu/xfce_menu-and-rules.defs pyxfce/branches/4.6/menu/xfce_menu-directory.defs pyxfce/branches/4.6/menu/xfce_menu-element.defs pyxfce/branches/4.6/menu/xfce_menu-environment.defs pyxfce/branches/4.6/menu/xfce_menu-item-cache.defs pyxfce/branches/4.6/menu/xfce_menu-item-pool.defs pyxfce/branches/4.6/menu/xfce_menu-item.defs pyxfce/branches/4.6/menu/xfce_menu-layout.defs pyxfce/branches/4.6/menu/xfce_menu-monitor.defs pyxfce/branches/4.6/menu/xfce_menu-move.defs pyxfce/branches/4.6/menu/xfce_menu-not-rules.defs pyxfce/branches/4.6/menu/xfce_menu-or-rules.defs pyxfce/branches/4.6/menu/xfce_menu-rules.defs pyxfce/branches/4.6/menu/xfce_menu-separator.defs pyxfce/branches/4.6/menu/xfce_menu-standard-rules.defs pyxfce/branches/4.6/menu/xfce_menu.defs Modified: pyxfce/branches/4.6/__init__.py pyxfce/branches/4.6/configure.ac Log: add 'menu' module. Modified: pyxfce/branches/4.6/__init__.py === --- pyxfce/branches/4.6/__init__.py 2009-07-02 22:30:40 UTC (rev 30177) +++ pyxfce/branches/4.6/__init__.py 2009-07-02 22:35:48 UTC (rev 30178) @@ -1,5 +1,5 @@ -__all__ = [ "gui", "mcs", "netk", "panel", "util" ] +__all__ = [ "gui", "menu", "netk", "panel", "util" ] #import util #import gui Modified: pyxfce/branches/4.6/configure.ac === --- pyxfce/branches/4.6/configure.ac2009-07-02 22:30:40 UTC (rev 30177) +++ pyxfce/branches/4.6/configure.ac2009-07-02 22:35:48 UTC (rev 30178) @@ -57,6 +57,7 @@ dnl PANEL_EXTERNALPLUGINDIR dnl PANEL_DESKTOPDATADIR +BM_DEPEND([XFCE4_MENU], [libxfce4menu-0.1], [4.5.92]) BM_DEPEND([GTK], [gtk+-2.0], [2.4]) BM_DEPEND([PYGTK], [pygtk-2.0], [2.6.0]) @@ -84,6 +85,7 @@ Makefile pyxfce-1.0.pc gui/Makefile + menu/Makefile netk/Makefile panel/Makefile util/Makefile Added: pyxfce/branches/4.6/menu/Makefile.am === --- pyxfce/branches/4.6/menu/Makefile.am(rev 0) +++ pyxfce/branches/4.6/menu/Makefile.am2009-07-02 22:35:48 UTC (rev 30178) @@ -0,0 +1,90 @@ +...@set_make@ + +PLATFORM_VERSION = 4.2 + +CODEGEN_PATH = @CODEGEN_PATH@ + +common_ldflags = -module -avoid-version -export-symbols-regex init_menu +if PLATFORM_WIN32 +common_ldflags += -no-undefined +endif + +INCLUDES = $(PYTHON_INCLUDES) + +pyxfceexecdir = $(pyexecdir)/xfce4 +pyxfceexec_LTLIBRARIES = _menu.la +pyxfceexec_PYTHON = menu.py + +_menu_la_CFLAGS = $(XFCE4_MENU_CFLAGS) $(PYTHON_CFLAGS) $(PYGTK_CFLAGS) +_menu_la_LDFLAGS = $(common_ldflags) +_menu_la_LIBADD = $(XFCE4_MENU_LIBS) +#-export-symbols-regex +_menu_la_SOURCES = \ + aboutdialog.c \ + appmenuitem.c \ + clock.c \ + colorbutton.c \ + decorbutton.c \ + decortoggle.c \ + dialogs.c \ + filechooser.c \ + framebox.c \ + gdk_extensions.c \ + gtk_extensions.c \ + gtk_style.c \ + gtktoxevent.c \ + iconbutton.c \ + icontheme.c \ + icons.c \ + menubutton.c \ + movehandler.c \ + scaled_image.c \ + session_client.c \ + systemtray.c \ + titled_dialog.c \ + togglebutton.c \ + menumodule.c \ + startup-notification.c + +defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs +defs_DATA = \ +libxfce4menu_config.defs \ +libxfce4menu.defs \ +xfce_menu-and-rules.defs \ +xfce_menu.defs \ +xfce_menu-directory.defs \ +xfce_menu-element.defs \ +xfce_menu-environment.defs \ +xfce_menu-item-cache.defs \ +xfce_menu-item.defs \ +xfce_menu-item-pool.defs \ +xfce_menu-layout.defs \ +xfce_menu-monitor.defs \ +xfce_menu-move.defs \ +xfce_menu-not-rules.defs \ +xfce_menu-or-rules.defs \ +xfce_menu-rules.defs \ +xfce_menu-separator.defs \ +xfce_menu-standard-rules.defs + +menu_overrides = + + +EXTRA_DIST = $(defs_DATA) $(menu_overrides) gen + +nodist__menu_la_SOURCES = + +PYGTK_DEFS="`pkg-config --variable=defsdir pygtk-2.0`" + +.defs.c: + (cd $(srcdir) \ +&& $(PYTHON) $(CODEGEN_PATH)/codegen.py \ + $(PYGTK_CODEGEN_DEFINES) \ +--override $*.override \ +--register $(PYGTK_DEFS)/gtk-types.defs \ +--register $(PYGTK_DEFS)/gdk-types.defs \ +--register ../util/desktopentry.defs \ +--prefix py$* $*.defs) > gen-$*.c \ +&& cp gen-$*.c $*.c \ +&& rm -f gen-$*.c + Added: pyxfce/branches/4.6/menu/gen === --- pyxfce/branches/4.6/menu/gen
[Xfce4-commits] r30205 - pyxfce/branches/4.6/util
Author: dannym Date: 2009-07-06 16:44:35 + (Mon, 06 Jul 2009) New Revision: 30205 Modified: pyxfce/branches/4.6/util/desktopentry.c pyxfce/branches/4.6/util/fileutils.c pyxfce/branches/4.6/util/i18n.c pyxfce/branches/4.6/util/kiosk.c pyxfce/branches/4.6/util/miscutils.c pyxfce/branches/4.6/util/rc.c pyxfce/branches/4.6/util/resource.c pyxfce/branches/4.6/util/utf8.c Log: pyxfce 4.6: util: update to PyGTK 2.14. Modified: pyxfce/branches/4.6/util/desktopentry.c === --- pyxfce/branches/4.6/util/desktopentry.c 2009-07-06 16:44:10 UTC (rev 30204) +++ pyxfce/branches/4.6/util/desktopentry.c 2009-07-06 16:44:35 UTC (rev 30205) @@ -18,7 +18,7 @@ /* -- forward type declarations -- */ -PyTypeObject PyXfceDesktopEntry_Type; +PyTypeObject G_GNUC_INTERNAL PyXfceDesktopEntry_Type; #line 24 "desktopentry.c" @@ -31,7 +31,9 @@ { const gchar *ret; + ret = xfce_desktop_entry_get_file(XFCE_DESKTOP_ENTRY(self->obj)); + if (ret) return PyString_FromString(ret); Py_INCREF(Py_None); @@ -56,7 +58,7 @@ Py_INCREF(Py_None); return Py_None; } -#line 60 "desktopentry.c" +#line 62 "desktopentry.c" #line 29 "desktopentry.override" @@ -83,7 +85,7 @@ Py_INCREF(Py_None); return Py_None; } -#line 87 "desktopentry.c" +#line 89 "desktopentry.c" static PyObject * @@ -93,60 +95,66 @@ char *key; int ret; -if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceDesktopEntry.has_translated_entry", kwlist, &key)) +if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceDesktopEntry.has_translated_entry", kwlist, &key)) return NULL; + ret = xfce_desktop_entry_has_translated_entry(XFCE_DESKTOP_ENTRY(self->obj), key); + return PyBool_FromLong(ret); } -static PyMethodDef _PyXfceDesktopEntry_methods[] = { -{ "get_file", (PyCFunction)_wrap_xfce_desktop_entry_get_file, METH_NOARGS }, -{ "get_int", (PyCFunction)_wrap_xfce_desktop_entry_get_int, METH_VARARGS|METH_KEYWORDS }, -{ "get_string", (PyCFunction)_wrap_xfce_desktop_entry_get_string, METH_VARARGS|METH_KEYWORDS }, -{ "has_translated_entry", (PyCFunction)_wrap_xfce_desktop_entry_has_translated_entry, METH_VARARGS|METH_KEYWORDS }, -{ NULL, NULL, 0 } +static const PyMethodDef _PyXfceDesktopEntry_methods[] = { +{ "get_file", (PyCFunction)_wrap_xfce_desktop_entry_get_file, METH_NOARGS, + NULL }, +{ "get_int", (PyCFunction)_wrap_xfce_desktop_entry_get_int, METH_VARARGS|METH_KEYWORDS, + NULL }, +{ "get_string", (PyCFunction)_wrap_xfce_desktop_entry_get_string, METH_VARARGS|METH_KEYWORDS, + NULL }, +{ "has_translated_entry", (PyCFunction)_wrap_xfce_desktop_entry_has_translated_entry, METH_VARARGS|METH_KEYWORDS, + NULL }, +{ NULL, NULL, 0, NULL } }; -PyTypeObject PyXfceDesktopEntry_Type = { +PyTypeObject G_GNUC_INTERNAL PyXfceDesktopEntry_Type = { PyObject_HEAD_INIT(NULL) -0, /* ob_size */ -"desktopentry.DesktopEntry", /* tp_name */ -sizeof(PyGObject), /* tp_basicsize */ -0, /* tp_itemsize */ +0, /* ob_size */ +"desktopentry.DesktopEntry", /* tp_name */ +sizeof(PyGObject), /* tp_basicsize */ +0, /* tp_itemsize */ /* methods */ -(destructor)0, /* tp_dealloc */ -(printfunc)0, /* tp_print */ -(getattrfunc)0,/* tp_getattr */ -(setattrfunc)0,/* tp_setattr */ -(cmpfunc)0,/* tp_compare */ -(reprfunc)0, /* tp_repr */ +(destructor)0,/* tp_dealloc */ +(printfunc)0, /* tp_print */ +(getattrfunc)0, /* tp_getattr */ +(setattrfunc)0, /* tp_setattr */ +(cmpfunc)0, /* tp_compare */ +(reprfunc)0, /* tp_repr */ (PyNumberMethods*)0, /* tp_as_number */ (PySequenceMethods*)0, /* tp_as_sequence */ (PyMappingMethods*)0, /* tp_as_mapping */ -(hashfunc)0, /* tp_hash */ -(ternaryfunc)0,/* tp_call */ -(reprfunc)0, /* tp_str */ -(getattrofunc)0, /* tp_getattro */ -(setattrofunc)0, /* tp_setattro */ -(PyBufferProcs*)0, /* tp_as_buffer */ +(hashfunc)0, /* tp_hash */ +(ternaryfunc)0, /* tp_call */ +(reprfunc)0, /* tp_str */ +(getattrofunc)0, /* tp_getattro */ +(setattrofunc)0, /* tp_setattro */ +(PyBufferProcs*)0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ -NULL, /* Documentation string */ -(traverseproc)0, /* tp_traverse */ -(inquiry)0,/* tp_clear */ -(ric
[Xfce4-commits] r30206 - pyxfce/branches/4.6/netk
Author: dannym Date: 2009-07-06 16:46:35 + (Mon, 06 Jul 2009) New Revision: 30206 Modified: pyxfce/branches/4.6/netk/trayicon.defs Log: pyxfce 4.6: netk: update to PyGTK 2.14. Modified: pyxfce/branches/4.6/netk/trayicon.defs === --- pyxfce/branches/4.6/netk/trayicon.defs 2009-07-06 16:44:35 UTC (rev 30205) +++ pyxfce/branches/4.6/netk/trayicon.defs 2009-07-06 16:46:35 UTC (rev 30206) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-trayicon.h +;; From netk-trayicon.h (define-function tray_icon_get_type (c-name "netk_tray_icon_get_type") @@ -21,8 +21,19 @@ (c-name "netk_tray_icon_new") (is-constructor-of "NetkTrayIcon") (return-type "GtkWidget*") + (parameters +'("Screen*" "screen") + ) ) +(define-function tray_icon_new_gdk + (c-name "netk_tray_icon_new_gdk") + (return-type "NetkTrayIcon*") + (parameters +'("GdkScreen*" "screen") + ) +) + (define-method set_screen (of-object "NetkTrayIcon") (c-name "netk_tray_icon_set_screen") @@ -32,6 +43,15 @@ ) ) +(define-method set_gdkscreen + (of-object "NetkTrayIcon") + (c-name "netk_tray_icon_set_gdkscreen") + (return-type "none") + (parameters +'("GdkScreen*" "screen") + ) +) + (define-method message_new (of-object "NetkTrayIcon") (c-name "netk_tray_icon_message_new") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30393 - pyxfce/branches/4.4/netk
Author: dannym Date: 2009-07-26 09:01:15 + (Sun, 26 Jul 2009) New Revision: 30393 Added: pyxfce/branches/4.4/netk/set_geometry.c Modified: pyxfce/branches/4.4/netk/Makefile.am pyxfce/branches/4.4/netk/gen Log: pygtk: add a local function 'netk_window_set_geometry' to xfce4.netk.Window . Modified: pyxfce/branches/4.4/netk/Makefile.am === --- pyxfce/branches/4.4/netk/Makefile.am2009-07-25 11:12:29 UTC (rev 30392) +++ pyxfce/branches/4.4/netk/Makefile.am2009-07-26 09:01:15 UTC (rev 30393) @@ -30,7 +30,8 @@ window.c \ window_menu.c \ workspace.c \ - netkmodule.c + netkmodule.c \ + set_geometry.c defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs defs_DATA = \ Modified: pyxfce/branches/4.4/netk/gen === --- pyxfce/branches/4.4/netk/gen2009-07-25 11:12:29 UTC (rev 30392) +++ pyxfce/branches/4.4/netk/gen2009-07-26 09:01:15 UTC (rev 30393) @@ -17,7 +17,8 @@ #echo "${defs}" - python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}" + python /usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}" + #python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}" fi done rm -f util.defs @@ -77,3 +78,17 @@ ) ) EOF + +cat >>window.defs << EXF +(define-method set_geometry + (of-object "NetkWindow") + (c-name "netk_window_set_geometry") + (return-type "none") + (parameters +'("int" "xp") +'("int" "yp") +'("int" "widthp") +'("int" "heightp") + ) +) +EXF Added: pyxfce/branches/4.4/netk/set_geometry.c === --- pyxfce/branches/4.4/netk/set_geometry.c (rev 0) +++ pyxfce/branches/4.4/netk/set_geometry.c 2009-07-26 09:01:15 UTC (rev 30393) @@ -0,0 +1,64 @@ +#include + +static void p_netk_move_window (Screen * screen, Window xwindow, int x, int y, int width, int height); +Screen *p_netk_screen_get_xscreen (NetkScreen * screen); +Atom p_netk_atom_get (const char *atom_name); + +#define NETK_SCREEN_XSCREEN(screen) (p_netk_screen_get_xscreen (screen)) + +/** +* netk_window_set_geometry: +* @window: a #NetkWindow +* @x: the new x coordinate of the default corner, or -1 to leave unchanged. +* @y: the new y coordinate of the default corner, or -1 to leave unchanged. +* @width: the new width of the window, or -1 to leave unchanged. +* @height: the new height of the window, or -1 to leave unchanged. +* +* Note that the geometry is NOT changed immediately but rather by the window manager when or if it sees fit. +*/ +void +netk_window_set_geometry(NetkWindow* window, int x, int y, int width, int height) +/*const GdkGeometry* geometry*/ +{ +g_return_if_fail (NETK_IS_WINDOW (window)); +/** uses "_NET_MOVERESIZE_WINDOW" to set the geometry. */ +p_netk_move_window (NETK_SCREEN_XSCREEN (netk_window_get_screen (window)), netk_window_get_xid (window), x, y, width, height); +} + +/* TODO maybe fallback to manual XMoveWindow since Xfce <= 4.4 didn't support "_NET_MOVERESIZE_WINDOW".*/ +/* pass -1 for the field that you do not want to change. */ +void +p_netk_move_window (Screen * screen, Window xwindow, int x, int y, int width, int height) +{ +XEvent xev; +unsigned long grflags = 0; /* default gravity, */ + +xev.xclient.type = ClientMessage; +xev.xclient.serial = 0; +xev.xclient.send_event = True; +xev.xclient.display = gdk_display; +xev.xclient.window = xwindow; +xev.xclient.message_type = p_netk_atom_get ("_NET_MOVERESIZE_WINDOW"); +xev.xclient.format = 32; + +if (x != -1) +grflags |= (1 << 8); + +if (y != -1) +grflags |= (1 << 9); + +if (width != -1) +grflags |= (1 << 10); + +if (height != -1) +grflags |= (1 << 11); + +xev.xclient.data.l[0] = grflags; +xev.xclient.data.l[1] = x; +xev.xclient.data.l[2] = y; +xev.xclient.data.l[3] = width; +xev.xclient.data.l[4] = height; + +XSendEvent (gdk_display, RootWindowOfScreen (screen), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); +} + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30394 - pyxfce/branches/4.6/netk
Author: dannym Date: 2009-07-26 09:01:29 + (Sun, 26 Jul 2009) New Revision: 30394 Added: pyxfce/branches/4.6/netk/set_geometry.c Modified: pyxfce/branches/4.6/netk/Makefile.am pyxfce/branches/4.6/netk/gen Log: pygtk: add a local function 'netk_window_set_geometry' to xfce4.netk.Window . Modified: pyxfce/branches/4.6/netk/Makefile.am === --- pyxfce/branches/4.6/netk/Makefile.am2009-07-26 09:01:15 UTC (rev 30393) +++ pyxfce/branches/4.6/netk/Makefile.am2009-07-26 09:01:29 UTC (rev 30394) @@ -30,7 +30,8 @@ window.c \ window_menu.c \ workspace.c \ - netkmodule.c + netkmodule.c \ + set_geometry.c defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs defs_DATA = \ Modified: pyxfce/branches/4.6/netk/gen === --- pyxfce/branches/4.6/netk/gen2009-07-26 09:01:15 UTC (rev 30393) +++ pyxfce/branches/4.6/netk/gen2009-07-26 09:01:29 UTC (rev 30394) @@ -77,3 +77,17 @@ # ) #) #EOF + +cat >>window.defs << EXF +(define-method set_geometry + (of-object "NetkWindow") + (c-name "netk_window_set_geometry") + (return-type "none") + (parameters +'("int" "xp") +'("int" "yp") +'("int" "widthp") +'("int" "heightp") + ) +) +EXF Added: pyxfce/branches/4.6/netk/set_geometry.c === --- pyxfce/branches/4.6/netk/set_geometry.c (rev 0) +++ pyxfce/branches/4.6/netk/set_geometry.c 2009-07-26 09:01:29 UTC (rev 30394) @@ -0,0 +1,64 @@ +#include + +static void p_netk_move_window (Screen * screen, Window xwindow, int x, int y, int width, int height); +Screen *p_netk_screen_get_xscreen (NetkScreen * screen); +Atom p_netk_atom_get (const char *atom_name); + +#define NETK_SCREEN_XSCREEN(screen) (p_netk_screen_get_xscreen (screen)) + +/** +* netk_window_set_geometry: +* @window: a #NetkWindow +* @x: the new x coordinate of the default corner, or -1 to leave unchanged. +* @y: the new y coordinate of the default corner, or -1 to leave unchanged. +* @width: the new width of the window, or -1 to leave unchanged. +* @height: the new height of the window, or -1 to leave unchanged. +* +* Note that the geometry is NOT changed immediately but rather by the window manager when or if it sees fit. +*/ +void +netk_window_set_geometry(NetkWindow* window, int x, int y, int width, int height) +/*const GdkGeometry* geometry*/ +{ +g_return_if_fail (NETK_IS_WINDOW (window)); +/** uses "_NET_MOVERESIZE_WINDOW" to set the geometry. */ +p_netk_move_window (NETK_SCREEN_XSCREEN (netk_window_get_screen (window)), netk_window_get_xid (window), x, y, width, height); +} + +/* TODO maybe fallback to manual XMoveWindow since Xfce <= 4.4 didn't support "_NET_MOVERESIZE_WINDOW".*/ +/* pass -1 for the field that you do not want to change. */ +void +p_netk_move_window (Screen * screen, Window xwindow, int x, int y, int width, int height) +{ +XEvent xev; +unsigned long grflags = 0; /* default gravity, */ + +xev.xclient.type = ClientMessage; +xev.xclient.serial = 0; +xev.xclient.send_event = True; +xev.xclient.display = gdk_display; +xev.xclient.window = xwindow; +xev.xclient.message_type = p_netk_atom_get ("_NET_MOVERESIZE_WINDOW"); +xev.xclient.format = 32; + +if (x != -1) +grflags |= (1 << 8); + +if (y != -1) +grflags |= (1 << 9); + +if (width != -1) +grflags |= (1 << 10); + +if (height != -1) +grflags |= (1 << 11); + +xev.xclient.data.l[0] = grflags; +xev.xclient.data.l[1] = x; +xev.xclient.data.l[2] = y; +xev.xclient.data.l[3] = width; +xev.xclient.data.l[4] = height; + +XSendEvent (gdk_display, RootWindowOfScreen (screen), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); +} + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30395 - pyxfce/branches/4.6/netk
Author: dannym Date: 2009-07-26 09:04:45 + (Sun, 26 Jul 2009) New Revision: 30395 Modified: pyxfce/branches/4.6/netk/window.defs Log: add 'NetkWindow.set_geometry' to the defs. Modified: pyxfce/branches/4.6/netk/window.defs === --- pyxfce/branches/4.6/netk/window.defs2009-07-26 09:01:29 UTC (rev 30394) +++ pyxfce/branches/4.6/netk/window.defs2009-07-26 09:04:45 UTC (rev 30395) @@ -497,3 +497,14 @@ ) +(define-method set_geometry + (of-object "NetkWindow") + (c-name "netk_window_set_geometry") + (return-type "none") + (parameters +'("int" "xp") +'("int" "yp") +'("int" "widthp") +'("int" "heightp") + ) +) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30409 - pyxfce/branches/4.6/netk
Author: dannym Date: 2009-07-28 07:38:31 + (Tue, 28 Jul 2009) New Revision: 30409 Modified: pyxfce/branches/4.6/netk/window.c pyxfce/branches/4.6/netk/window.override Log: pyxfce 4.6: add 'set_geometry'. Modified: pyxfce/branches/4.6/netk/window.c === --- pyxfce/branches/4.6/netk/window.c 2009-07-28 02:14:55 UTC (rev 30408) +++ pyxfce/branches/4.6/netk/window.c 2009-07-28 07:38:31 UTC (rev 30409) @@ -12,9 +12,11 @@ extern PyTypeObject PyNetkWorkspace_Type; -#line 16 "window.c" +void netk_window_set_geometry(NetkWindow* window, int x, int y, int width, int height); +#line 18 "window.c" + /* -- types from other modules -- */ static PyTypeObject *_PyGObject_Type; #define PyGObject_Type (*_PyGObject_Type) @@ -25,7 +27,7 @@ /* -- forward type declarations -- */ PyTypeObject G_GNUC_INTERNAL PyNetkWindow_Type; -#line 29 "window.c" +#line 31 "window.c" @@ -147,7 +149,7 @@ return Py_None; } -#line 43 "window.override" +#line 45 "window.override" static PyObject * _wrap_netk_window_get_pid(PyGObject *self) { @@ -161,7 +163,7 @@ return PyInt_FromLong(ret); } -#line 165 "window.c" +#line 167 "window.c" static PyObject * @@ -708,7 +710,7 @@ return pyg_flags_from_gtype(NETK_TYPE_WINDOW_STATE, ret); } -#line 33 "window.override" +#line 35 "window.override" static PyObject * _wrap_netk_window_get_geometry(PyGObject *self) { @@ -717,7 +719,7 @@ netk_window_get_geometry(NETK_WINDOW(self->obj), &x, &y, &width, &height); return Py_BuildValue("()", x, y, width, height); } -#line 721 "window.c" +#line 723 "window.c" static PyObject * @@ -768,6 +770,21 @@ } +static PyObject * +_wrap_netk_window_set_geometry(PyGObject *self, PyObject *args, PyObject *kwargs) +{ +static char *kwlist[] = { "xp", "yp", "widthp", "heightp", NULL }; +int xp, yp, widthp, heightp; + +if (!PyArg_ParseTupleAndKeywords(args, kwargs,":NetkWindow.set_geometry", kwlist, &xp, &yp, &widthp, &heightp)) +return NULL; + +netk_window_set_geometry(NETK_WINDOW(self->obj), xp, yp, widthp, heightp); + +Py_INCREF(Py_None); +return Py_None; +} + static const PyMethodDef _PyNetkWindow_methods[] = { { "get_screen", (PyCFunction)_wrap_netk_window_get_screen, METH_NOARGS, NULL }, @@ -891,6 +908,8 @@ NULL }, { "is_in_viewport", (PyCFunction)_wrap_netk_window_is_in_viewport, METH_VARARGS|METH_KEYWORDS, NULL }, +{ "set_geometry", (PyCFunction)_wrap_netk_window_set_geometry, METH_VARARGS|METH_KEYWORDS, + NULL }, { NULL, NULL, 0, NULL } }; @@ -1014,7 +1033,7 @@ } -#line 1018 "window.c" +#line 1037 "window.c" pygobject_register_class(d, "NetkWindow", NETK_TYPE_WINDOW, &PyNetkWindow_Type, Py_BuildValue("(O)", &PyGObject_Type)); pyg_set_object_has_new_constructor(NETK_TYPE_WINDOW); } Modified: pyxfce/branches/4.6/netk/window.override === --- pyxfce/branches/4.6/netk/window.override2009-07-28 02:14:55 UTC (rev 30408) +++ pyxfce/branches/4.6/netk/window.override2009-07-28 07:38:31 UTC (rev 30409) @@ -10,6 +10,8 @@ extern PyTypeObject PyNetkWorkspace_Type; +void netk_window_set_geometry(NetkWindow* window, int x, int y, int width, int height); + %% include %% ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24808 - pyxfce/trunk
Author: dannym Date: 2007-02-02 16:48:45 + (Fri, 02 Feb 2007) New Revision: 24808 Modified: pyxfce/trunk/TODO Log: done Modified: pyxfce/trunk/TODO === --- pyxfce/trunk/TODO 2007-02-02 16:48:27 UTC (rev 24807) +++ pyxfce/trunk/TODO 2007-02-02 16:48:45 UTC (rev 24808) @@ -16,9 +16,6 @@ fix mcs stuff -mask exec_command and friends ? - - Ex: (object Widget (in-module (Gtk)) (parent Object) ;; could say (parent Object (Gtk)) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24807 - pyxfce/trunk/gui
Author: dannym Date: 2007-02-02 16:48:27 + (Fri, 02 Feb 2007) New Revision: 24807 Modified: pyxfce/trunk/gui/dialogs.override Log: get rid of compat stuff before someone gets used to it Modified: pyxfce/trunk/gui/dialogs.override === --- pyxfce/trunk/gui/dialogs.override 2007-02-01 21:06:21 UTC (rev 24806) +++ pyxfce/trunk/gui/dialogs.override 2007-02-02 16:48:27 UTC (rev 24807) @@ -16,6 +16,17 @@ import gtk.Widget as PyGtkWidget_Type %% ignore + show_info + show_warning + show_error + confirm + create_header + create_header_with_image + small_label + mixed_button_new + exec_command + exec_command_full_with_envp + %% ignore-glob *_get_type ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24817 - libxfcegui4/trunk/libxfcegui4
Author: dannym Date: 2007-02-03 11:34:36 + (Sat, 03 Feb 2007) New Revision: 24817 Modified: libxfcegui4/trunk/libxfcegui4/netk-trayicon.c libxfcegui4/trunk/libxfcegui4/netk-trayicon.h Log: add setters for gdkscreen (convenience) Modified: libxfcegui4/trunk/libxfcegui4/netk-trayicon.c === --- libxfcegui4/trunk/libxfcegui4/netk-trayicon.c 2007-02-03 11:13:26 UTC (rev 24816) +++ libxfcegui4/trunk/libxfcegui4/netk-trayicon.c 2007-02-03 11:34:36 UTC (rev 24817) @@ -421,3 +421,14 @@ netk_tray_icon_opcode (icon, gtk_plug_get_id (GTK_PLUG (icon)), SYSTEM_TRAY_CANCEL_MESSAGE, id, 0, 0); } + +NetkTrayIcon *netk_tray_icon_new_gdk (GdkScreen *screen) +{ +return NETK_TRAY_ICON(netk_tray_icon_new(GDK_SCREEN_XSCREEN(screen))); +} + +void netk_tray_icon_set_gdkscreen (NetkTrayIcon *trayicon, GdkScreen *screen) +{ +netk_tray_icon_set_screen(trayicon, GDK_SCREEN_XSCREEN(screen)); +} + Modified: libxfcegui4/trunk/libxfcegui4/netk-trayicon.h === --- libxfcegui4/trunk/libxfcegui4/netk-trayicon.h 2007-02-03 11:13:26 UTC (rev 24816) +++ libxfcegui4/trunk/libxfcegui4/netk-trayicon.h 2007-02-03 11:34:36 UTC (rev 24817) @@ -78,7 +78,10 @@ /* functions */ GType netk_tray_icon_get_type (void); GtkWidget *netk_tray_icon_new (Screen *screen); +NetkTrayIcon *netk_tray_icon_new_gdk (GdkScreen *screen); void netk_tray_icon_set_screen (NetkTrayIcon *trayicon, Screen *screen); +void netk_tray_icon_set_gdkscreen (NetkTrayIcon *trayicon, GdkScreen *screen); +/* netk_tray_icon_get_gdkscreen = gtk_window_get_screen */ glong netk_tray_icon_message_new (NetkTrayIcon *trayicon, glong id, const gchar *text); void netk_tray_icon_message_cancel (NetkTrayIcon *trayicon, glong id); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24809 - pyxfce/trunk
Author: dannym Date: 2007-02-02 16:50:25 + (Fri, 02 Feb 2007) New Revision: 24809 Modified: pyxfce/trunk/__init__.py Log: in view of better modularity/speed, don't default-import everything Modified: pyxfce/trunk/__init__.py === --- pyxfce/trunk/__init__.py2007-02-02 16:48:45 UTC (rev 24808) +++ pyxfce/trunk/__init__.py2007-02-02 16:50:25 UTC (rev 24809) @@ -1,15 +1,15 @@ __all__ = [ "gui", "mcs", "netk", "panel", "util" ] -import util -import gui -import netk -import mcs -import exceptions - -try: - import panel -except exceptions.ImportError, e: - pass +#import util +#import gui +#import netk +#import mcs +#import exceptions +# +#try: +# import panel +#except exceptions.ImportError, e: +# pass ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24815 - libxfcegui4/trunk/libxfcegui4
Author: dannym Date: 2007-02-03 11:13:02 + (Sat, 03 Feb 2007) New Revision: 24815 Modified: libxfcegui4/trunk/libxfcegui4/netk-tasklist.c libxfcegui4/trunk/libxfcegui4/netk-tasklist.h Log: add getters Modified: libxfcegui4/trunk/libxfcegui4/netk-tasklist.c === --- libxfcegui4/trunk/libxfcegui4/netk-tasklist.c 2007-02-03 11:07:23 UTC (rev 24814) +++ libxfcegui4/trunk/libxfcegui4/netk-tasklist.c 2007-02-03 11:13:02 UTC (rev 24815) @@ -2575,3 +2575,60 @@ return task; } + +NetkScreen* +netk_tasklist_get_screen(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), NULL); + +return tasklist->priv->screen; +} + +NetkTasklistGroupingType +netk_tasklist_get_grouping(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE); + +return tasklist->priv->grouping; +} + +gboolean +netk_tasklist_get_switch_workspace_on_unminimize(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE); + +return tasklist->priv->switch_workspace_on_unminimize; +} + +gint +netk_tasklist_get_grouping_limit(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE); + +return tasklist->priv->grouping_limit; +} + +gboolean +netk_tasklist_get_include_all_workspaces(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE); + +return tasklist->priv->include_all_workspaces; +} + +gboolean +netk_tasklist_get_show_label(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE); + +return tasklist->priv->show_label; +} + +GtkReliefStyle +netk_tasklist_get_button_relief(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), GTK_RELIEF_NONE); + +return tasklist->priv->relief; +} + Modified: libxfcegui4/trunk/libxfcegui4/netk-tasklist.h === --- libxfcegui4/trunk/libxfcegui4/netk-tasklist.h 2007-02-03 11:07:23 UTC (rev 24814) +++ libxfcegui4/trunk/libxfcegui4/netk-tasklist.h 2007-02-03 11:13:02 UTC (rev 24815) @@ -98,5 +98,14 @@ void netk_tasklist_set_button_relief (NetkTasklist * tasklist, GtkReliefStyle relief); + + NetkScreen* netk_tasklist_get_screen(NetkTasklist * tasklist); + NetkTasklistGroupingType netk_tasklist_get_grouping(NetkTasklist * tasklist); + gboolean netk_tasklist_get_switch_workspace_on_unminimize(NetkTasklist * tasklist); + gint netk_tasklist_get_grouping_limit(NetkTasklist * tasklist); + gboolean netk_tasklist_get_include_all_workspaces(NetkTasklist * tasklist); + gboolean netk_tasklist_get_show_label(NetkTasklist * tasklist); + GtkReliefStyle netk_tasklist_get_button_relief(NetkTasklist * tasklist); + G_END_DECLS #endif /* NETK_TASKLIST_H */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24828 - libxfcegui4/trunk/libxfcegui4
Author: dannym Date: 2007-02-03 14:22:01 + (Sat, 03 Feb 2007) New Revision: 24828 Modified: libxfcegui4/trunk/libxfcegui4/netk-xutils.c Log: shut warnings Modified: libxfcegui4/trunk/libxfcegui4/netk-xutils.c === --- libxfcegui4/trunk/libxfcegui4/netk-xutils.c 2007-02-03 14:19:40 UTC (rev 24827) +++ libxfcegui4/trunk/libxfcegui4/netk-xutils.c 2007-02-03 14:22:01 UTC (rev 24828) @@ -2201,10 +2201,10 @@ return FALSE; } -*x = data[0]; -*y = data[1]; -*width = data[2]; -*height = data[3]; +*x = (int) data[0]; +*y = (int) data[1]; +*width = (int) data[2]; +*height = (int) data[3]; XFree (data); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24810 - pyxfce/trunk
Author: dannym Date: 2007-02-02 16:52:53 + (Fri, 02 Feb 2007) New Revision: 24810 Modified: pyxfce/trunk/configure.ac Log: 4.4.0 Modified: pyxfce/trunk/configure.ac === --- pyxfce/trunk/configure.ac 2007-02-02 16:50:25 UTC (rev 24809) +++ pyxfce/trunk/configure.ac 2007-02-02 16:52:53 UTC (rev 24810) @@ -4,11 +4,11 @@ ACLOCAL_AMFLAGS = -I m4 m4_define(pyxfce_major_version, 4) -m4_define(pyxfce_minor_version, 3) -m4_define(pyxfce_micro_version, 90) +m4_define(pyxfce_minor_version, 4) +m4_define(pyxfce_micro_version, 0) m4_define(pyxfce_version, pyxfce_major_version.pyxfce_minor_version.pyxfce_micro_version) -m4_define(xfce_required_version, 4.3.99) +m4_define(xfce_required_version, 4.4.0) AC_INIT(pyxfce, pyxfce_version, []) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24820 - libxfcegui4/trunk/libxfcegui4
Author: dannym Date: 2007-02-03 13:02:11 + (Sat, 03 Feb 2007) New Revision: 24820 Modified: libxfcegui4/trunk/libxfcegui4/libnetk.h Log: add netk-class-group Modified: libxfcegui4/trunk/libxfcegui4/libnetk.h === --- libxfcegui4/trunk/libxfcegui4/libnetk.h 2007-02-03 12:15:43 UTC (rev 24819) +++ libxfcegui4/trunk/libxfcegui4/libnetk.h 2007-02-03 13:02:11 UTC (rev 24820) @@ -27,6 +27,7 @@ #include #include #include +#include #include #include ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24818 - libxfcegui4/branches/xfce_4_4/libxfcegui4
Author: dannym Date: 2007-02-03 11:35:17 + (Sat, 03 Feb 2007) New Revision: 24818 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-trayicon.c libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-trayicon.h Log: add setters for gdkscreen (convenience) Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-trayicon.c === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-trayicon.c 2007-02-03 11:34:36 UTC (rev 24817) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-trayicon.c 2007-02-03 11:35:17 UTC (rev 24818) @@ -421,3 +421,14 @@ netk_tray_icon_opcode (icon, gtk_plug_get_id (GTK_PLUG (icon)), SYSTEM_TRAY_CANCEL_MESSAGE, id, 0, 0); } + +NetkTrayIcon *netk_tray_icon_new_gdk (GdkScreen *screen) +{ +return NETK_TRAY_ICON(netk_tray_icon_new(GDK_SCREEN_XSCREEN(screen))); +} + +void netk_tray_icon_set_gdkscreen (NetkTrayIcon *trayicon, GdkScreen *screen) +{ +netk_tray_icon_set_screen(trayicon, GDK_SCREEN_XSCREEN(screen)); +} + Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-trayicon.h === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-trayicon.h 2007-02-03 11:34:36 UTC (rev 24817) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-trayicon.h 2007-02-03 11:35:17 UTC (rev 24818) @@ -78,7 +78,10 @@ /* functions */ GType netk_tray_icon_get_type (void); GtkWidget *netk_tray_icon_new (Screen *screen); +NetkTrayIcon *netk_tray_icon_new_gdk (GdkScreen *screen); void netk_tray_icon_set_screen (NetkTrayIcon *trayicon, Screen *screen); +void netk_tray_icon_set_gdkscreen (NetkTrayIcon *trayicon, GdkScreen *screen); +/* netk_tray_icon_get_gdkscreen = gtk_window_get_screen */ glong netk_tray_icon_message_new (NetkTrayIcon *trayicon, glong id, const gchar *text); void netk_tray_icon_message_cancel (NetkTrayIcon *trayicon, glong id); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24813 - libxfcegui4/branches/xfce_4_4/libxfcegui4
Author: dannym Date: 2007-02-03 10:34:30 + (Sat, 03 Feb 2007) New Revision: 24813 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-screen.c libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-screen.h Log: add netk_screen_get_workspaces for consistency Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-screen.c === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-screen.c 2007-02-03 10:34:00 UTC (rev 24812) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-screen.c 2007-02-03 10:34:30 UTC (rev 24813) @@ -481,6 +481,21 @@ } /** + * netk_screen_get_workspaces: + * @screen: a #NetkScreen + * + * Gets the screen's list of workspaces. + * The list is not copied and should not be freed. + * + * Return value: reference to list of workspaces + **/ +GList* +netk_screen_get_workspaces (NetkScreen * screen) +{ +return screen->priv->workspaces; +} + +/** * netk_screen_get_windows: * @screen: a #NetkScreen * Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-screen.h === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-screen.h 2007-02-03 10:34:00 UTC (rev 24812) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-screen.h 2007-02-03 10:34:30 UTC (rev 24813) @@ -113,6 +113,7 @@ NetkWindow *netk_screen_get_active_window (NetkScreen * screen); GList *netk_screen_get_windows (NetkScreen * screen); GList *netk_screen_get_windows_stacked (NetkScreen * screen); + GList *netk_screen_get_workspaces (NetkScreen * screen); void netk_screen_force_update (NetkScreen * screen); int netk_screen_get_workspace_count (NetkScreen * screen); void netk_screen_change_workspace_count (NetkScreen * screen, int count); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24824 - libxfcegui4/trunk/libxfcegui4
Author: dannym Date: 2007-02-03 13:29:02 + (Sat, 03 Feb 2007) New Revision: 24824 Modified: libxfcegui4/trunk/libxfcegui4/libnetk.h Log: add #include Modified: libxfcegui4/trunk/libxfcegui4/libnetk.h === --- libxfcegui4/trunk/libxfcegui4/libnetk.h 2007-02-03 13:23:47 UTC (rev 24823) +++ libxfcegui4/trunk/libxfcegui4/libnetk.h 2007-02-03 13:29:02 UTC (rev 24824) @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24831 - libxfcegui4/branches/xfce_4_4/libxfcegui4
Author: dannym Date: 2007-02-03 14:26:56 + (Sat, 03 Feb 2007) New Revision: 24831 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.h Log: export netk_window_get_icon_geometry Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.h === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.h 2007-02-03 14:26:27 UTC (rev 24830) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.h 2007-02-03 14:26:56 UTC (rev 24831) @@ -199,6 +199,8 @@ void netk_window_set_icon_geometry (NetkWindow * window, int x, int y, int width, int height); + +gboolean netk_window_get_icon_geometry (NetkWindow * window, int *xp, int *yp, int *widthp, int *heightp); NetkWindowActions netk_window_get_actions (NetkWindow * window); NetkWindowState netk_window_get_state (NetkWindow * window); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24821 - libxfcegui4/branches/xfce_4_4/libxfcegui4
Author: dannym Date: 2007-02-03 13:02:58 + (Sat, 03 Feb 2007) New Revision: 24821 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/libnetk.h Log: add netk-class-group Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/libnetk.h === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/libnetk.h 2007-02-03 13:02:11 UTC (rev 24820) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/libnetk.h 2007-02-03 13:02:58 UTC (rev 24821) @@ -27,6 +27,7 @@ #include #include #include +#include #include #include ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24825 - libxfcegui4/branches/xfce_4_4/libxfcegui4
Author: dannym Date: 2007-02-03 13:29:17 + (Sat, 03 Feb 2007) New Revision: 24825 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/libnetk.h Log: add #include Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/libnetk.h === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/libnetk.h 2007-02-03 13:29:02 UTC (rev 24824) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/libnetk.h 2007-02-03 13:29:17 UTC (rev 24825) @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24834 - libxfcegui4/trunk/libxfcegui4
Author: dannym Date: 2007-02-03 17:50:12 + (Sat, 03 Feb 2007) New Revision: 24834 Modified: libxfcegui4/trunk/libxfcegui4/session-client.c libxfcegui4/trunk/libxfcegui4/session-client.h Log: explain what constness is to C Modified: libxfcegui4/trunk/libxfcegui4/session-client.c === --- libxfcegui4/trunk/libxfcegui4/session-client.c 2007-02-03 17:43:55 UTC (rev 24833) +++ libxfcegui4/trunk/libxfcegui4/session-client.c 2007-02-03 17:50:12 UTC (rev 24834) @@ -1172,28 +1172,28 @@ return session_client->program; } -gchar** const client_session_get_clone_command(SessionClient * session_client) +G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_clone_command(SessionClient * session_client) { -return session_client->clone_command; +return (const gchar * const *) session_client->clone_command; } -gchar** const client_session_get_resign_command(SessionClient * session_client) +G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_resign_command(SessionClient * session_client) { -return session_client->resign_command; +return (const gchar * const *) session_client->resign_command; } -gchar** const client_session_get_restart_command(SessionClient * session_client) +G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_restart_command(SessionClient * session_client) { -return session_client->restart_command; +return (const gchar * const *) session_client->restart_command; } -gchar** const client_session_get_discard_command(SessionClient * session_client) +G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_discard_command(SessionClient * session_client) { -return session_client->discard_command; +return (const gchar * const *) session_client->discard_command; } -gchar** const client_session_get_shutdown_command(SessionClient * session_client) +G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_shutdown_command(SessionClient * session_client) { -return session_client->shutdown_command; +return (const gchar * const *) session_client->shutdown_command; } Modified: libxfcegui4/trunk/libxfcegui4/session-client.h === --- libxfcegui4/trunk/libxfcegui4/session-client.h 2007-02-03 17:43:55 UTC (rev 24833) +++ libxfcegui4/trunk/libxfcegui4/session-client.h 2007-02-03 17:50:12 UTC (rev 24834) @@ -158,9 +158,9 @@ gchar const* client_session_get_given_client_id(SessionClient * session_client); gchar const* client_session_get_current_directory(SessionClient * session_client); gchar const* client_session_get_program(SessionClient * session_client); -gchar** const client_session_get_clone_command(SessionClient * session_client); -gchar** const client_session_get_resign_command(SessionClient * session_client); -gchar** const client_session_get_restart_command(SessionClient * session_client); -gchar** const client_session_get_discard_command(SessionClient * session_client); -gchar** const client_session_get_shutdown_command(SessionClient * session_client); +G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_clone_command(SessionClient * session_client); +G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_resign_command(SessionClient * session_client); +G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_restart_command(SessionClient * session_client); +G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_discard_command(SessionClient * session_client); +G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_shutdown_command(SessionClient * session_client); #endif ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24827 - libxfcegui4/branches/xfce_4_4/libxfcegui4
Author: dannym Date: 2007-02-03 14:19:40 + (Sat, 03 Feb 2007) New Revision: 24827 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.c libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-xutils.c libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-xutils.h Log: add netk_window_get_icon_geometry Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.c === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.c 2007-02-03 14:18:55 UTC (rev 24826) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.c 2007-02-03 14:19:40 UTC (rev 24827) @@ -135,6 +135,7 @@ guint need_update_transient_for:1; guint need_update_wmclass : 1; guint need_update_wmhints : 1; +guint need_update_icon_geometry : 1; /* if available */ char *client_machine; @@ -384,6 +385,7 @@ window->priv->need_update_transient_for = TRUE; window->priv->need_update_wmclass = TRUE; window->priv->need_update_wmhints = TRUE; +window->priv->need_update_icon_geometry = TRUE; force_update_now (window); return window; @@ -1273,6 +1275,42 @@ } /** + * netk_window_get_icon_geometry: + * @window: a #NetkWindow + * @xp: return location for X coordinate of icon + * @yp: return location for Y coordinate of icon + * @widthp: return location for width of icon + * @heightp: return location for height of icon + * + * Gets the size and position of the icon. + * returns %TRUE if there was one. + * + **/ +gboolean +netk_window_get_icon_geometry (NetkWindow * window, int *xp, int *yp, int *widthp, int *heightp) +{ +g_return_if_fail (NETK_IS_WINDOW (window)); + +if (window->priv->icon_geometry.width == -1) { +return FALSE; +} + +if (xp != NULL) +*xp = window->priv->icon_geometry.x; + +if (yp != NULL) +*yp = window->priv->icon_geometry.y; + +if (widthp != NULL) +*widthp = window->priv->icon_geometry.width; + +if (heightp != NULL) +*heightp = window->priv->icon_geometry.height; + +return TRUE; +} + +/** * netk_window_set_icon_geometry: * @window: a #NetkWindow * @x: x coordinate in pixels @@ -1452,6 +1490,11 @@ window->priv->need_update_wmhints = TRUE; queue_update (window); } +else if (xevent->xproperty.atom == p_netk_atom_get ("_NET_WM_ICON_GEOMETRY")) +{ +window->priv->need_update_icon_geometry = TRUE; +queue_update (window); +} } void @@ -1882,6 +1925,18 @@ &window->priv->res_name); } +static void +update_icon_geometry (NetkWindow *window) +{ +if (!window->priv->need_update_icon_geometry) +return; + +window->priv->need_update_icon_geometry = FALSE; +if (!p_netk_get_icon_geometry(window->priv->xwindow, &window->priv->icon_geometry.x, &window->priv->icon_geometry.y, &window->priv->icon_geometry.width, &window->priv->icon_geometry.height)) { +window->priv->icon_geometry.width = -1; +} +} + static void update_wmhints (NetkWindow *window) { @@ -1952,13 +2007,13 @@ update_wmhints (window); update_transient_for (window); /* wintype needs this to be first */ update_wintype (window); +update_icon_geometry (window); update_wm_state (window); update_state (window); /* must come after the above, since they affect * our calculated state */ update_workspace (window); /* emits signals */ update_actions (window); - get_icons (window); Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-xutils.c === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-xutils.c 2007-02-03 14:18:55 UTC (rev 24826) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-xutils.c 2007-02-03 14:19:40 UTC (rev 24827) @@ -2177,6 +2177,40 @@ p_netk_error_trap_pop (); } +gboolean +p_netk_get_icon_geometry (Window xwindow, int* x, int* y, int* width, int* height) +{ +Atom type; +int format; +gulong nitems; +gulong bytes_after; +gulong *data; +int err, result; + +p_netk_error_trap_push (); +type = None; +result = XGetWindowProperty (gdk_display, xwindow, p_netk_atom_get ("_NET_WM_ICON_GEOMETRY"), 0, 4, False, XA_CARDINAL, &type, &format, &nitems, &bytes_after, (guchar **)&data); +err = p_netk_error_trap_pop (); + +if (err != Success || result != Success) +return FALSE; + +if (type != XA_CARDINAL || nitems != 4) +{ +XFree (data); +return FALSE; +} + +*x = data[0]; +*y = data[1]; +*width = data[2]; +*height = data[3]; + +XFree (data); + +return TRUE; +} + void p_netk_set_type_hint (Window xwindow, NetkWindowType type) { Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-xutils.h =
[Xfce4-commits] r24816 - libxfcegui4/branches/xfce_4_4/libxfcegui4
Author: dannym Date: 2007-02-03 11:13:26 + (Sat, 03 Feb 2007) New Revision: 24816 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.c libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.h Log: add getters Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.c === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.c 2007-02-03 11:13:02 UTC (rev 24815) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.c 2007-02-03 11:13:26 UTC (rev 24816) @@ -2575,3 +2575,60 @@ return task; } + +NetkScreen* +netk_tasklist_get_screen(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), NULL); + +return tasklist->priv->screen; +} + +NetkTasklistGroupingType +netk_tasklist_get_grouping(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE); + +return tasklist->priv->grouping; +} + +gboolean +netk_tasklist_get_switch_workspace_on_unminimize(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE); + +return tasklist->priv->switch_workspace_on_unminimize; +} + +gint +netk_tasklist_get_grouping_limit(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE); + +return tasklist->priv->grouping_limit; +} + +gboolean +netk_tasklist_get_include_all_workspaces(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE); + +return tasklist->priv->include_all_workspaces; +} + +gboolean +netk_tasklist_get_show_label(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE); + +return tasklist->priv->show_label; +} + +GtkReliefStyle +netk_tasklist_get_button_relief(NetkTasklist * tasklist) +{ +g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), GTK_RELIEF_NONE); + +return tasklist->priv->relief; +} + Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.h === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.h 2007-02-03 11:13:02 UTC (rev 24815) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.h 2007-02-03 11:13:26 UTC (rev 24816) @@ -98,5 +98,14 @@ void netk_tasklist_set_button_relief (NetkTasklist * tasklist, GtkReliefStyle relief); + + NetkScreen* netk_tasklist_get_screen(NetkTasklist * tasklist); + NetkTasklistGroupingType netk_tasklist_get_grouping(NetkTasklist * tasklist); + gboolean netk_tasklist_get_switch_workspace_on_unminimize(NetkTasklist * tasklist); + gint netk_tasklist_get_grouping_limit(NetkTasklist * tasklist); + gboolean netk_tasklist_get_include_all_workspaces(NetkTasklist * tasklist); + gboolean netk_tasklist_get_show_label(NetkTasklist * tasklist); + GtkReliefStyle netk_tasklist_get_button_relief(NetkTasklist * tasklist); + G_END_DECLS #endif /* NETK_TASKLIST_H */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24829 - libxfcegui4/branches/xfce_4_4/libxfcegui4
Author: dannym Date: 2007-02-03 14:22:37 + (Sat, 03 Feb 2007) New Revision: 24829 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-xutils.c Log: shut warnings Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-xutils.c === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-xutils.c 2007-02-03 14:22:01 UTC (rev 24828) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-xutils.c 2007-02-03 14:22:37 UTC (rev 24829) @@ -2201,10 +2201,10 @@ return FALSE; } -*x = data[0]; -*y = data[1]; -*width = data[2]; -*height = data[3]; +*x = (int) data[0]; +*y = (int) data[1]; +*width = (int) data[2]; +*height = (int) data[3]; XFree (data); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24822 - libxfcegui4/trunk/libxfcegui4
Author: dannym Date: 2007-02-03 13:23:20 + (Sat, 03 Feb 2007) New Revision: 24822 Modified: libxfcegui4/trunk/libxfcegui4/libnetk.h Log: add netk-trayicon Modified: libxfcegui4/trunk/libxfcegui4/libnetk.h === --- libxfcegui4/trunk/libxfcegui4/libnetk.h 2007-02-03 13:02:58 UTC (rev 24821) +++ libxfcegui4/trunk/libxfcegui4/libnetk.h 2007-02-03 13:23:20 UTC (rev 24822) @@ -28,6 +28,7 @@ #include #include #include +#include #include #include ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24826 - libxfcegui4/trunk/libxfcegui4
Author: dannym Date: 2007-02-03 14:18:55 + (Sat, 03 Feb 2007) New Revision: 24826 Modified: libxfcegui4/trunk/libxfcegui4/netk-window.c libxfcegui4/trunk/libxfcegui4/netk-xutils.c libxfcegui4/trunk/libxfcegui4/netk-xutils.h Log: add p_netk_get_icon_geometry Modified: libxfcegui4/trunk/libxfcegui4/netk-window.c === --- libxfcegui4/trunk/libxfcegui4/netk-window.c 2007-02-03 13:29:17 UTC (rev 24825) +++ libxfcegui4/trunk/libxfcegui4/netk-window.c 2007-02-03 14:18:55 UTC (rev 24826) @@ -135,6 +135,7 @@ guint need_update_transient_for:1; guint need_update_wmclass : 1; guint need_update_wmhints : 1; +guint need_update_icon_geometry : 1; /* if available */ char *client_machine; @@ -384,6 +385,7 @@ window->priv->need_update_transient_for = TRUE; window->priv->need_update_wmclass = TRUE; window->priv->need_update_wmhints = TRUE; +window->priv->need_update_icon_geometry = TRUE; force_update_now (window); return window; @@ -1273,6 +1275,42 @@ } /** + * netk_window_get_icon_geometry: + * @window: a #NetkWindow + * @xp: return location for X coordinate of icon + * @yp: return location for Y coordinate of icon + * @widthp: return location for width of icon + * @heightp: return location for height of icon + * + * Gets the size and position of the icon. + * returns %TRUE if there was one. + * + **/ +gboolean +netk_window_get_icon_geometry (NetkWindow * window, int *xp, int *yp, int *widthp, int *heightp) +{ +g_return_if_fail (NETK_IS_WINDOW (window)); + +if (window->priv->icon_geometry.width == -1) { +return FALSE; +} + +if (xp != NULL) +*xp = window->priv->icon_geometry.x; + +if (yp != NULL) +*yp = window->priv->icon_geometry.y; + +if (widthp != NULL) +*widthp = window->priv->icon_geometry.width; + +if (heightp != NULL) +*heightp = window->priv->icon_geometry.height; + +return TRUE; +} + +/** * netk_window_set_icon_geometry: * @window: a #NetkWindow * @x: x coordinate in pixels @@ -1452,6 +1490,11 @@ window->priv->need_update_wmhints = TRUE; queue_update (window); } +else if (xevent->xproperty.atom == p_netk_atom_get ("_NET_WM_ICON_GEOMETRY")) +{ +window->priv->need_update_icon_geometry = TRUE; +queue_update (window); +} } void @@ -1882,6 +1925,18 @@ &window->priv->res_name); } +static void +update_icon_geometry (NetkWindow *window) +{ +if (!window->priv->need_update_icon_geometry) +return; + +window->priv->need_update_icon_geometry = FALSE; +if (!p_netk_get_icon_geometry(window->priv->xwindow, &window->priv->icon_geometry.x, &window->priv->icon_geometry.y, &window->priv->icon_geometry.width, &window->priv->icon_geometry.height)) { +window->priv->icon_geometry.width = -1; +} +} + static void update_wmhints (NetkWindow *window) { @@ -1952,13 +2007,13 @@ update_wmhints (window); update_transient_for (window); /* wintype needs this to be first */ update_wintype (window); +update_icon_geometry (window); update_wm_state (window); update_state (window); /* must come after the above, since they affect * our calculated state */ update_workspace (window); /* emits signals */ update_actions (window); - get_icons (window); Modified: libxfcegui4/trunk/libxfcegui4/netk-xutils.c === --- libxfcegui4/trunk/libxfcegui4/netk-xutils.c 2007-02-03 13:29:17 UTC (rev 24825) +++ libxfcegui4/trunk/libxfcegui4/netk-xutils.c 2007-02-03 14:18:55 UTC (rev 24826) @@ -2177,6 +2177,40 @@ p_netk_error_trap_pop (); } +gboolean +p_netk_get_icon_geometry (Window xwindow, int* x, int* y, int* width, int* height) +{ +Atom type; +int format; +gulong nitems; +gulong bytes_after; +gulong *data; +int err, result; + +p_netk_error_trap_push (); +type = None; +result = XGetWindowProperty (gdk_display, xwindow, p_netk_atom_get ("_NET_WM_ICON_GEOMETRY"), 0, 4, False, XA_CARDINAL, &type, &format, &nitems, &bytes_after, (guchar **)&data); +err = p_netk_error_trap_pop (); + +if (err != Success || result != Success) +return FALSE; + +if (type != XA_CARDINAL || nitems != 4) +{ +XFree (data); +return FALSE; +} + +*x = data[0]; +*y = data[1]; +*width = data[2]; +*height = data[3]; + +XFree (data); + +return TRUE; +} + void p_netk_set_type_hint (Window xwindow, NetkWindowType type) { Modified: libxfcegui4/trunk/libxfcegui4/netk-xutils.h === --- libxfcegui4/trunk/libxfcegui4/netk-xutils.h 2007-02-03 13:29:17 UTC (rev 24825) +++ libxf
[Xfce4-commits] r24830 - libxfcegui4/trunk/libxfcegui4
Author: dannym Date: 2007-02-03 14:26:27 + (Sat, 03 Feb 2007) New Revision: 24830 Modified: libxfcegui4/trunk/libxfcegui4/netk-window.h Log: add netk_window_get_icon_geometry as public Modified: libxfcegui4/trunk/libxfcegui4/netk-window.h === --- libxfcegui4/trunk/libxfcegui4/netk-window.h 2007-02-03 14:22:37 UTC (rev 24829) +++ libxfcegui4/trunk/libxfcegui4/netk-window.h 2007-02-03 14:26:27 UTC (rev 24830) @@ -199,6 +199,8 @@ void netk_window_set_icon_geometry (NetkWindow * window, int x, int y, int width, int height); + +gboolean netk_window_get_icon_geometry (NetkWindow * window, int *xp, int *yp, int *widthp, int *heightp); NetkWindowActions netk_window_get_actions (NetkWindow * window); NetkWindowState netk_window_get_state (NetkWindow * window); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24833 - libxfcegui4/trunk/libxfcegui4
Author: dannym Date: 2007-02-03 17:43:55 + (Sat, 03 Feb 2007) New Revision: 24833 Modified: libxfcegui4/trunk/libxfcegui4/session-client.c libxfcegui4/trunk/libxfcegui4/session-client.h Log: add SessionClient property accessors (paranoid) Modified: libxfcegui4/trunk/libxfcegui4/session-client.c === --- libxfcegui4/trunk/libxfcegui4/session-client.c 2007-02-03 14:29:25 UTC (rev 24832) +++ libxfcegui4/trunk/libxfcegui4/session-client.c 2007-02-03 17:43:55 UTC (rev 24833) @@ -831,3 +831,369 @@ return session_client; } + +void client_session_free(SessionClient * session_client) +{ +/* session_client->data; */ +/* session_client->session_connection; */ + +if (session_client->current_state != SESSION_CLIENT_DISCONNECTED) { +disconnect(session_client); +} + +g_free(session_client->client_id); +g_free(session_client->given_client_id); + +g_free(session_client->current_directory); +g_free(session_client->program); +g_strfreev(session_client->clone_command); +g_strfreev(session_client->resign_command); +g_strfreev(session_client->restart_command); +g_strfreev(session_client->discard_command); +g_strfreev(session_client->shutdown_command); +g_free(session_client); +} + +gchar* safe_strdup(gchar const* source) +{ +if (source != NULL) { +return g_strdup(source); +} else { +return NULL; +} +} + +gchar** safe_strvdup(gchar** const source) +{ +int count; +int i; +gchar** result; + +count = g_strv_length(source); +result = g_new0(gchar*, count + 1); + +for (i = 0; i < count; ++i) { +result[i] = safe_strdup(source[i]); +} + +result[count] = NULL; +return result; +} + +/* messes with session_connection: +SessionClient *client_session_copy(SessionClient * session_client) +{ +SessionClient* result; +result = g_new0(SessionClient, 1); + +result->data = session_client->data; +result->session_connection = session_client->session_connection; + +result->current_state = session_client->current_state; +result->restart_style = session_client->restart_style; +result->interact_style = session_client->interact_style; + +result->priority = session_client->priority; + +result->client_id = safe_strdup(session_client->client_id); +result->given_client_id = safe_strdup(session_client->given_client_id); + +result->current_directory = safe_strdup(session_client->current_directory); +result->program = safe_strdup(session_client->program); +result->clone_command = safe_strvdup(session_client->clone_command); +result->resign_command = safe_strvdup(session_client->resign_command); +result->restart_command = safe_strvdup(session_client->restart_command); +result->discard_command = safe_strvdup(session_client->discard_command); +result->shutdown_command = safe_strvdup(session_client->shutdown_command); + +result->shutdown = session_client->shutdown; +} +*/ + +void client_session_set_save_phase_2_callback(SessionClient * session_client, save_phase_2_callback value) +{ +session_client->save_phase_2 = value; +} + +void client_session_set_interact_callback(SessionClient * session_client, interact_callback value) +{ +session_client->interact = value; +} + +void client_session_set_shutdown_cancelled_callback(SessionClient * session_client, shutdown_cancelled_callback value) +{ +session_client->shutdown_cancelled = value; +} + +void client_session_set_save_complete_callback(SessionClient * session_client, save_complete_callback value) +{ +session_client->save_complete = value; +} + +void client_session_set_die_callback(SessionClient * session_client, die_callback value) +{ +session_client->die = value; +} + +void client_session_set_save_yourself_callback(SessionClient * session_client, save_yourself_callback value) +{ +session_client->save_yourself = value; +} + +void client_session_set_data(SessionClient * session_client, gpointer value) +{ +session_client->data = value; +} + +/*void client_session_set_session_connection(SessionClient * session_client, gpointer value)*/ + +/*void client_session_set_current_state(SessionClient * session_client, SessionClientState value)*/ + +void client_session_set_restart_style(SessionClient * session_client, SessionRestartStyle value) +{ +if (session_client->session_connection != NULL) { +g_error("SessionClient: changing \"restart_style\" while connected to session manager is not implemented."); +return; +} + +session_client->restart_style = value; +} + +/* void client_session_set_interact_style(SessionClient * session_client, SessionInteractStyle value) */ + +void client_session_set_priority(SessionClient * session_client, gchar value) +{ +if (session_client->session_connection != NULL) { +g_error("SessionClient: chang
[Xfce4-commits] r24823 - libxfcegui4/branches/xfce_4_4/libxfcegui4
Author: dannym Date: 2007-02-03 13:23:47 + (Sat, 03 Feb 2007) New Revision: 24823 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/libnetk.h Log: add netk trayicon Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/libnetk.h === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/libnetk.h 2007-02-03 13:23:20 UTC (rev 24822) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/libnetk.h 2007-02-03 13:23:47 UTC (rev 24823) @@ -28,6 +28,7 @@ #include #include #include +#include #include #include ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24812 - libxfcegui4/trunk/libxfcegui4
Author: dannym Date: 2007-02-03 10:34:00 + (Sat, 03 Feb 2007) New Revision: 24812 Modified: libxfcegui4/trunk/libxfcegui4/netk-screen.c libxfcegui4/trunk/libxfcegui4/netk-screen.h Log: add netk_screen_get_workspaces for consistency Modified: libxfcegui4/trunk/libxfcegui4/netk-screen.c === --- libxfcegui4/trunk/libxfcegui4/netk-screen.c 2007-02-02 16:56:25 UTC (rev 24811) +++ libxfcegui4/trunk/libxfcegui4/netk-screen.c 2007-02-03 10:34:00 UTC (rev 24812) @@ -481,6 +481,21 @@ } /** + * netk_screen_get_workspaces: + * @screen: a #NetkScreen + * + * Gets the screen's list of workspaces. + * The list is not copied and should not be freed. + * + * Return value: reference to list of workspaces + **/ +GList* +netk_screen_get_workspaces (NetkScreen * screen) +{ +return screen->priv->workspaces; +} + +/** * netk_screen_get_windows: * @screen: a #NetkScreen * Modified: libxfcegui4/trunk/libxfcegui4/netk-screen.h === --- libxfcegui4/trunk/libxfcegui4/netk-screen.h 2007-02-02 16:56:25 UTC (rev 24811) +++ libxfcegui4/trunk/libxfcegui4/netk-screen.h 2007-02-03 10:34:00 UTC (rev 24812) @@ -113,6 +113,7 @@ NetkWindow *netk_screen_get_active_window (NetkScreen * screen); GList *netk_screen_get_windows (NetkScreen * screen); GList *netk_screen_get_windows_stacked (NetkScreen * screen); + GList *netk_screen_get_workspaces (NetkScreen * screen); void netk_screen_force_update (NetkScreen * screen); int netk_screen_get_workspace_count (NetkScreen * screen); void netk_screen_change_workspace_count (NetkScreen * screen, int count); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24835 - xfce4-mixer/trunk/src
Author: dannym Date: 2007-02-03 21:59:56 + (Sat, 03 Feb 2007) New Revision: 24835 Modified: xfce4-mixer/trunk/src/mixer-profilebox.gob xfce4-mixer/trunk/src/xfce-mixer-profilebox.c Log: HIG some buttons Modified: xfce4-mixer/trunk/src/mixer-profilebox.gob === --- xfce4-mixer/trunk/src/mixer-profilebox.gob 2007-02-03 17:50:12 UTC (rev 24834) +++ xfce4-mixer/trunk/src/mixer-profilebox.gob 2007-02-03 21:59:56 UTC (rev 24835) @@ -495,7 +495,7 @@ s, parent, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, + GTK_STOCK_ADD, GTK_RESPONSE_OK, NULL )); g_free (s); @@ -524,7 +524,7 @@ name = xfce_mixer_profilebox_detail_get_name (detail); if (!name || !name[0]) { annoy_user (parent, GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, "%s", + GTK_BUTTONS_CLOSE, "%s", _("A profile needs a name")); retry = TRUE; } else if (!self_profile_exists (self, name)) { Modified: xfce4-mixer/trunk/src/xfce-mixer-profilebox.c === --- xfce4-mixer/trunk/src/xfce-mixer-profilebox.c 2007-02-03 17:50:12 UTC (rev 24834) +++ xfce4-mixer/trunk/src/xfce-mixer-profilebox.c 2007-02-03 21:59:56 UTC (rev 24835) @@ -789,7 +789,7 @@ s, parent, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, + GTK_STOCK_ADD, GTK_RESPONSE_OK, NULL )); g_free (s); @@ -818,7 +818,7 @@ name = xfce_mixer_profilebox_detail_get_name (detail); if (!name || !name[0]) { annoy_user (parent, GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, "%s", + GTK_BUTTONS_CLOSE, "%s", _("A profile needs a name")); retry = TRUE; } else if (!self_profile_exists (self, name)) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24836 - xfce4-mixer/branches/xfce_4_4/src
Author: dannym Date: 2007-02-03 22:00:18 + (Sat, 03 Feb 2007) New Revision: 24836 Modified: xfce4-mixer/branches/xfce_4_4/src/mixer-profilebox.gob xfce4-mixer/branches/xfce_4_4/src/xfce-mixer-profilebox.c Log: HIG some buttons Modified: xfce4-mixer/branches/xfce_4_4/src/mixer-profilebox.gob === --- xfce4-mixer/branches/xfce_4_4/src/mixer-profilebox.gob 2007-02-03 21:59:56 UTC (rev 24835) +++ xfce4-mixer/branches/xfce_4_4/src/mixer-profilebox.gob 2007-02-03 22:00:18 UTC (rev 24836) @@ -495,7 +495,7 @@ s, parent, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, + GTK_STOCK_ADD, GTK_RESPONSE_OK, NULL )); g_free (s); @@ -524,7 +524,7 @@ name = xfce_mixer_profilebox_detail_get_name (detail); if (!name || !name[0]) { annoy_user (parent, GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, "%s", + GTK_BUTTONS_CLOSE, "%s", _("A profile needs a name")); retry = TRUE; } else if (!self_profile_exists (self, name)) { Modified: xfce4-mixer/branches/xfce_4_4/src/xfce-mixer-profilebox.c === --- xfce4-mixer/branches/xfce_4_4/src/xfce-mixer-profilebox.c 2007-02-03 21:59:56 UTC (rev 24835) +++ xfce4-mixer/branches/xfce_4_4/src/xfce-mixer-profilebox.c 2007-02-03 22:00:18 UTC (rev 24836) @@ -789,7 +789,7 @@ s, parent, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, + GTK_STOCK_ADD, GTK_RESPONSE_OK, NULL )); g_free (s); @@ -818,7 +818,7 @@ name = xfce_mixer_profilebox_detail_get_name (detail); if (!name || !name[0]) { annoy_user (parent, GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, "%s", + GTK_BUTTONS_CLOSE, "%s", _("A profile needs a name")); retry = TRUE; } else if (!self_profile_exists (self, name)) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24837 - xfce4-mixer/trunk/src
Author: dannym Date: 2007-02-03 22:04:52 + (Sat, 03 Feb 2007) New Revision: 24837 Modified: xfce4-mixer/trunk/src/mixer-info.gob xfce4-mixer/trunk/src/xfce-mixer-info.c Log: add "Close" button Modified: xfce4-mixer/trunk/src/mixer-info.gob === --- xfce4-mixer/trunk/src/mixer-info.gob2007-02-03 22:00:18 UTC (rev 24836) +++ xfce4-mixer/trunk/src/mixer-info.gob2007-02-03 22:04:52 UTC (rev 24837) @@ -46,6 +46,9 @@ gtk_window_set_position (GTK_WINDOW (self), GTK_WIN_POS_CENTER); gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE); gtk_container_set_border_width (GTK_CONTAINER (self), 10); + + gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); + gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_CLOSE); } public GtkWidget *new(void) Modified: xfce4-mixer/trunk/src/xfce-mixer-info.c === --- xfce4-mixer/trunk/src/xfce-mixer-info.c 2007-02-03 22:00:18 UTC (rev 24836) +++ xfce4-mixer/trunk/src/xfce-mixer-info.c 2007-02-03 22:04:52 UTC (rev 24837) @@ -149,24 +149,27 @@ gtk_window_set_position (GTK_WINDOW (self), GTK_WIN_POS_CENTER); gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE); gtk_container_set_border_width (GTK_CONTAINER (self), 10); + + gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); + gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_CLOSE); -#line 154 "xfce-mixer-info.c" +#line 157 "xfce-mixer-info.c" } } #undef __GOB_FUNCTION__ -#line 51 "mixer-info.gob" +#line 54 "mixer-info.gob" GtkWidget * xfce_mixer_info_new (void) -#line 164 "xfce-mixer-info.c" +#line 167 "xfce-mixer-info.c" { #define __GOB_FUNCTION__ "Xfce:Mixer:Info::new" { -#line 52 "mixer-info.gob" +#line 55 "mixer-info.gob" return GTK_WIDGET (GET_NEW); }} -#line 172 "xfce-mixer-info.c" +#line 175 "xfce-mixer-info.c" #undef __GOB_FUNCTION__ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits