← Back to branch summary

~ubuntu-branches/debian/experimental/xfdesktop4/experimental

« back to all changes in this revision

Viewing changes to src/windowlist.c

  • Committer: Bazaar Package Importer
  • Author(s): Yves-Alexis Perez, Yves-Alexis Perez, Lionel Le Folgoc
  • Date: 2011-02-07 00:17:47 UTC
  • mfrom: (1.4.9 upstream) (5.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110207001747-htl6rhaglfhhik8g
Tags: 4.8.1-1
[ Yves-Alexis Perez ]
* New upstream development release.
* debian/control:
  - update standards version to 3.9.1.
  - refresh build-deps for Xfce 4.7.
  - add build dep on libxfce4ui-1-dev.
  - drop xfce4-panel build-dep since we don't build any plugin anymore.
  - add build-dep on hardening-includes.
* Switch to 3.0 (quilt) source format.
* debian/rules:
  - pick {C,LD}FLAGS from dpkg-buildflags.
  - drop --libexecdir, --disable-rpath and --enable-final from configure args.
  - drop usr/lib from chrpath call, it doesn't exist anymore.
  - don't rename generic terminal .desktop file, it's gone too.
  - pass docdir to configure.
  - add hardening flags to {C,LD}FLAGS
* debian/xfdesktop4-data.install:
  - drop usr/share/desktop-directories from install file.
* debian/xfdesktop4.install:
  - drop etc/ no menu is installed anymore.
  - drop usr/ too, no more desktop menu module nor panel plugin. 
* debian/copyright updated for new upstream release.

[ Lionel Le Folgoc ]
* New upstream bugfix release.
* debian/control: clean up build-deps since xfdesktop has been ported to gio,
  exo-1 and garcon.
* Refresh build-deps for Xfce 4.8.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/windowlist.c
38
38
#include <gtk/gtk.h>
39
39
#include <libwnck/libwnck.h>
40
40
#include <libxfce4util/libxfce4util.h>
41
 
#include <libxfcegui4/libxfcegui4.h>
 
41
#include <libxfce4ui/libxfce4ui.h>
42
42
 
43
43
#include "windowlist.h"
44
44
#include "xfdesktop-common.h"
227
227
    if(menu_children) {
228
228
        GtkWidget *tmpmenu = gtk_menu_new();
229
229
        gtk_menu_set_screen(GTK_MENU(tmpmenu), gscreen);
230
 
        gtk_widget_show(tmpmenu);
231
230
        
232
231
        mi = gtk_separator_menu_item_new();
233
232
        gtk_widget_show(mi);
258
257
            ws_name = wnck_workspace_get_name(wnck_workspace);
259
258
            
260
259
            if(wnck_workspace == active_workspace) {
261
 
                if(!ws_name || atoi(ws_name) == i+1)
 
260
                if(ws_name == NULL || *ws_name == '\0')
262
261
                    ws_label = g_strdup_printf(_("<b>Workspace %d</b>"), i+1);
263
262
                else {
264
263
                    gchar *ws_name_esc = g_markup_escape_text(ws_name, strlen(ws_name));
266
265
                    g_free(ws_name_esc);
267
266
                }
268
267
            } else {  /* don't italicise if we're showing stuff in submenus */
269
 
                if(!ws_name || atoi(ws_name) == i+1) {
 
268
                if(ws_name == NULL || *ws_name == '\0') {
270
269
                    if(wl_submenus)
271
270
                        ws_label = g_strdup_printf(_("Workspace %d"), i+1);
272
271
                    else
296
295
            
297
296
            if(wl_submenus) {
298
297
                submenu = gtk_menu_new();
299
 
                gtk_widget_show(submenu);
300
298
                gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi), submenu);
301
299
            } else {
302
300
                mi = gtk_separator_menu_item_new();